diff --git a/tools/drupal/modules/civicrm_ICIRR/ICIRR/Form/Profile.php b/tools/drupal/modules/civicrm_ICIRR/ICIRR/Form/Profile.php
deleted file mode 100644
index 491a04323253703daf260c5c5194f21584fafb2f..0000000000000000000000000000000000000000
--- a/tools/drupal/modules/civicrm_ICIRR/ICIRR/Form/Profile.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.1                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2011                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*/
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2011
- * $Id$
- *
- */
-class ICIRR_Form_Profile {
-  function buildProfile(&$form, $profileId = NULL) {
-    // get the activity type
-    $activityTypeId = CRM_Utils_Request::retrieve('acttype', 'Positive', $form);
-    $activityName   = CRM_Core_OptionGroup::getLabel('activity_type', $activityTypeId);
-    $activityName   = str_replace(' ', '_', $activityName);
-
-    if (!$activityTypeId) {
-      return;
-    }
-
-    // check if there is associated profile
-    $profileId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFGroup', $activityName, 'id', 'name');
-
-    if (!$profileId) {
-      return;
-    }
-
-    // get profile fields
-    require_once 'CRM/Core/BAO/UFGroup.php';
-    $form->_profileFields = CRM_Core_BAO_UFGroup::getFields($profileId, FALSE, CRM_Core_Action::VIEW);
-
-    $form->addElement('hidden', 'profile_id', $profileId);
-
-    // build profile
-    foreach ($form->_profileFields as $name => $field) {
-      $profileTitle = $field['groupTitle'];
-      CRM_Core_BAO_UFGroup::buildProfile($form, $field, NULL);
-    }
-
-    $form->assign('profileTitle', $profileTitle);
-    $form->assign('profileFields', $form->_profileFields);
-
-    // set defaults in profile
-    self::setProfileDefaults($form->_profileFields, $form);
-  }
-
-  function setProfileDefaults(&$fields, &$form) {
-    $defaults = array();
-    $activityId = CRM_Utils_Request::retrieve('activity_id', 'Positive', $form);
-    if ($activityId) {
-      // get the target contact id
-      $contactId = CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_ActivityTarget', $activityId, 'target_contact_id', 'activity_id');
-      if ($contactId) {
-        CRM_Core_BAO_UFGroup::setProfileDefaults($contactId, $fields, $profileDefaults, FALSE);
-        foreach ($profileDefaults as $key => $value) {
-          $index = substr(str_replace("field[$contactId][", '', $key), 0, -1);
-          $defaults[$index] = $value;
-        }
-        $form->setDefaults($defaults);
-      }
-    }
-  }
-}
-
diff --git a/tools/drupal/modules/civicrm_ICIRR/civicrm_ICIRR.info b/tools/drupal/modules/civicrm_ICIRR/civicrm_ICIRR.info
deleted file mode 100644
index 564c814e7cb3b80a60b57ca5d413998098ee7361..0000000000000000000000000000000000000000
--- a/tools/drupal/modules/civicrm_ICIRR/civicrm_ICIRR.info
+++ /dev/null
@@ -1,6 +0,0 @@
-name = CiviCRM ICIRR 
-description = "This module contains implementation of civicrm hooks specific to ICIRR needs."
-dependencies[] = civicrm
-package = CiviCRM
-core = 6.x
-version = 3.4
diff --git a/tools/drupal/modules/civicrm_ICIRR/civicrm_ICIRR.module b/tools/drupal/modules/civicrm_ICIRR/civicrm_ICIRR.module
deleted file mode 100644
index 9f341a358fe0211ab928326c771934859e70b0b8..0000000000000000000000000000000000000000
--- a/tools/drupal/modules/civicrm_ICIRR/civicrm_ICIRR.module
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.1                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2011                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007.                                       |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License along with this program; if not, contact CiviCRM LLC       |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*/
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2011
- * $Id$
- *
- */
-
-/**
- * Implementation of civicrn postProcess hook
- *
- * @return void
- * @access public
- */
-function civicrm_ICIRR_civicrm_postProcess($formName, &$form) {
-  //profile id = 31 for New NAI Contact profile
-  $profileId = $form->getVar('_gid');
-  $contactId = $form->getVar('_id');
-  // if gid = 31 then redirect to new activity
-  if (($formName == 'CRM_Profile_Form_Edit') && $profileId == 31) {
-    // build activity url, activity type id = 51 for NAI Open
-    // redirect to activity url
-    $url = CRM_Utils_System::url('civicrm/activity/add', 'action=add&reset=1&selectedChild=activity&atype=51&cid=' . $contactId);
-    CRM_Utils_System::redirect($url);
-  }
-  elseif ($formName == 'CRM_Activity_Form_Activity') {
-    $params = $form->exportValues();
-    $profileId = CRM_Utils_Array::value('profile_id', $params);
-
-    if (!$profileId) {
-      return;
-    }
-
-    //build contact params
-    $contactParams = array();
-    foreach ($params as $key => $value) {
-      if (array_key_exists($key, $form->_profileFields)) {
-        $contactParams[$key] = $value;
-      }
-    }
-
-    $contactParams['preserveDBName'] = TRUE;
-
-    $contactId = $params['target_contact_id'];
-    if ($contactId && !empty($contactParams)) {
-      //crm_core_error::debug( 'c', $contactParams );
-      require_once 'CRM/Contact/BAO/Contact.php';
-      CRM_Contact_BAO_Contact::createProfileContact($contactParams, $form->_profileFields, $contactId);
-    }
-  }
-}
-
-/**
- * Implementation of civicrn postProcess hook
- *
- * @return void
- * @access public
- */
-function civicrm_ICIRR_civicrm_buildForm($formName, &$form) {
-  if ($formName == 'CRM_Activity_Form_Activity') {
-    if ($form->_action & (CRM_Core_Action::DELETE | CRM_Core_Action::RENEW)) {
-      return;
-    }
-
-    $includeProfile = CRM_Utils_Array::value('includeProfile', $_GET);
-    $form->assign('includeProfile', FALSE);
-
-    if ($includeProfile) {
-      $form->assign('includeProfile', TRUE);
-      $form->assign('suppressForm', TRUE);
-      require_once 'ICIRR/Form/Profile.php';
-      ICIRR_Form_Profile::buildProfile($form);
-    }
-    else {
-      require_once 'ICIRR/Form/Profile.php';
-      ICIRR_Form_Profile::buildProfile($form);
-    }
-  }
-}
-
-/**
- * Implementation of civicrn validate hook
- *
- * @return void
- * @access public
- */
-function civicrm_ICIRR_civicrm_validate($formName, &$fields, &$files, &$form) {
-  if ($formName == 'CRM_Activity_Form_Activity') {
-    if ($form->_action & (CRM_Core_Action::DELETE | CRM_Core_Action::RENEW)) {
-      return TRUE;
-    }
-
-    if (in_array($form->_activityTypeId, array(51, 47, 48, 49, 50))) {
-      // make sure only one target contact is selected
-      $targetContacts = explode(',', $fields['target_contact_id']);
-      $errors = array();
-      if (empty($targetContacts[0])) {
-        $errors['target_contact_id'] = ts('You need to select at least one With Contact.');
-      }
-      elseif (count($targetContacts) > 1) {
-        $errors['target_contact_id'] = ts('You cannot selected more than one With Contact.');
-      }
-      return empty($errors) ? TRUE : $errors;
-    }
-  }
-}
-
-/**
- * Implementation of config hook to set custom template
- *
- * @return void
- * @access public
- */
-function civicrm_ICIRR_civicrm_config(&$config) {
-  $template = &CRM_Core_Smarty::singleton();
-
-  $currentRoot = dirname(__FILE__);
-
-  $currentDir = $currentRoot . DIRECTORY_SEPARATOR . 'templates';
-
-  if (is_array($template->template_dir)) {
-    array_unshift($template->template_dir, $currentDir);
-  }
-  else {
-    $template->template_dir = array($currentDir, $template->template_dir);
-  }
-
-  // also fix php include path
-  $include_path = $currentRoot . PATH_SEPARATOR . get_include_path();
-  set_include_path($include_path);
-}
-
diff --git a/tools/drupal/modules/civicrm_ICIRR/templates/CRM/Activity/Form/Activity.extra.tpl b/tools/drupal/modules/civicrm_ICIRR/templates/CRM/Activity/Form/Activity.extra.tpl
deleted file mode 100644
index 36d88f1b212e4b5a1e87c47ca8057167dc713481..0000000000000000000000000000000000000000
--- a/tools/drupal/modules/civicrm_ICIRR/templates/CRM/Activity/Form/Activity.extra.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-{if $smarty.get.snippet neq 4}
-{literal}
-<script type="text/javascript">
-cj( function() {
-    modifyActivityForm( );
-    cj('#activity_type_id').change( function() {
-        modifyActivityForm( );
-    });
-});
-
-function modifyActivityForm( ) {
-    var selectedActivityType = cj('#activity_type_id').val();
-    if ( !selectedActivityType ) {
-        // retrieve from assigned value
-        {/literal}
-        {if $atype}
-        selectedActivityType = '{$atype}';
-        {/if}
-        {literal}
-    }
-    
-    buildProfileForm( selectedActivityType );
-    switch ( selectedActivityType ) {
-        // NAI Open 
-        case '51':
-            alterFormElements( true );
-            // remove unwanted statuses
-            cj("#status_id option[value='1']").remove();
-            cj("#status_id option[value='2']").remove();
-            cj("#status_id option[value='3']").remove();
-            cj("#status_id option[value='4']").remove();
-            cj("#status_id option[value='5']").remove();
-            cj("#status_id option[value='6']").remove();
-            break;
-        // NAI Prepare Application
-        case '47':
-            alterFormElements( true );
-            break;
-        // NAI Refer Out
-        case '48':
-            alterFormElements( true );
-            break;
-        // NAI Follow Up
-        case '49':
-            alterFormElements( true );
-            break;
-        // NAI Close
-        case '50':
-            alterFormElements( true );
-            break;
-        default:
-            alterFormElements( false );
-    }
-}
-
-function alterFormElements( hide ) {
-    if ( hide ) {
-        cj('.crm-activity-form-block-location').hide(); 
-        cj('.crm-activity-form-block-duration').hide(); 
-        cj('.crm-activity-form-block-priority_id').hide(); 
-        cj('.crm-activity-form-block-details td.label').text('Notes');
-    } else {
-        cj('.crm-activity-form-block-location').show(); 
-        cj('.crm-activity-form-block-duration').show(); 
-        cj('.crm-activity-form-block-priority_id').show(); 
-        cj('.crm-activity-form-block-details td.label').text('Details');
-    }
-}
-
-function buildProfileForm( activityType ) {
-    if ( !activityType ) {
-        cj( '#crm-activity-profile' ).html( '' );
-        return;
-    }
-
-    var dataUrl = {/literal}"{crmURL h=0 q='includeProfile=1&snippet=4&acttype='}"{literal} + activityType; 
-    {/literal}
-    {if $qfKey}
-        dataUrl = dataUrl + '&qfKey=' + '{$qfKey}'
-    {/if}
-    
-    {if $entityID}
-        dataUrl = dataUrl + '&activity_id=' + '{$entityID}'
-    {/if}
-    {literal}
-	
-    var response = cj.ajax({
-                    url: dataUrl,
-                    async: false
-                    }).responseText;
-
-    cj( '#crm-activity-profile' ).html( response );
-}
-</script>
-{/literal}
-{/if}
diff --git a/tools/drupal/modules/civicrm_ICIRR/templates/CRM/Activity/Form/Activity.tpl b/tools/drupal/modules/civicrm_ICIRR/templates/CRM/Activity/Form/Activity.tpl
deleted file mode 100644
index 2887c152e154b0d115cec06b8e7ffe3fbc37eb23..0000000000000000000000000000000000000000
--- a/tools/drupal/modules/civicrm_ICIRR/templates/CRM/Activity/Form/Activity.tpl
+++ /dev/null
@@ -1,364 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.1                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2011                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-{* this template is used for adding/editing other (custom) activities. *}
-{if $includeProfile}
-    {include file='ICIRR/Form/Profile.tpl'}
-{elseif $cdType }
-   {include file="CRM/Custom/Form/CustomData.tpl"}
-{else}
-    {if $action eq 4}
-        <div class="crm-block crm-content-block crm-activity-view-block">
-    {else}
-        {if $context NEQ 'standalone'}
-            <h3>{if $action eq 1 or $action eq 1024}{ts 1=$activityTypeName}New %1{/ts}{elseif $action eq 8}{ts 1=$activityTypeName}Delete %1{/ts}{else}{ts 1=$activityTypeName}Edit %1{/ts}{/if}</h3> 
-        {/if}
-        <div class="crm-block crm-form-block crm-activity-form-block">
-    {/if}
-    {* added onload javascript for source contact*}
-    {literal}
-    <script type="text/javascript">
-    var target_contact = assignee_contact = '';
-
-    {/literal}
-    {if $target_contact}
-        var target_contact = {$target_contact};
-    {/if}
-    
-    {if $assignee_contact}
-        var assignee_contact = {$assignee_contact};
-    {/if}
-    
-    {literal}
-    var target_contact_id = assignee_contact_id = null;
-    //loop to set the value of cc and bcc if form rule.
-    var toDataUrl = "{/literal}{crmURL p='civicrm/ajax/checkemail' q='id=1&noemail=1' h=0 }{literal}"; {/literal}
-    {foreach from=","|explode:"target,assignee" key=key item=element}
-      {assign var=currentElement value=`$element`_contact_id}
-      {if $form.$currentElement.value }
-         {literal} var {/literal}{$currentElement}{literal} = cj.ajax({ url: toDataUrl + "&cid={/literal}{$form.$currentElement.value}{literal}", async: false }).responseText;{/literal}
-      {/if}
-    {/foreach}
-    {literal}
-    if ( target_contact_id ) {
-      eval( 'target_contact = ' + target_contact_id );
-    }
-    if ( assignee_contact_id ) {
-      eval( 'assignee_contact = ' + assignee_contact_id );
-    }
-    cj(document).ready( function( ) {
-    {/literal}
-    {if $source_contact and $admin and $action neq 4} 
-    {literal} cj( '#source_contact_id' ).val( "{/literal}{$source_contact}{literal}");{/literal}
-    {/if}
-    {literal}
-
-    var sourceDataUrl = "{/literal}{$dataUrl}{literal}";
-    var tokenDataUrl  = "{/literal}{$tokenUrl}{literal}";
-    var hintText = "{/literal}{ts}Type in a partial or complete name of an existing contact.{/ts}{literal}";
-    cj( "#target_contact_id"  ).tokenInput( tokenDataUrl, { prePopulate: target_contact,   theme: 'facebook', hintText: hintText });
-    cj( "#assignee_contact_id").tokenInput( tokenDataUrl, { prePopulate: assignee_contact, theme: 'facebook', hintText: hintText });
-    cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' );
-    cj('#source_contact_id').autocomplete( sourceDataUrl, { width : 180, selectFirst : false, hintText: hintText, matchContains: true, minChars: 1
-                                }).result( function(event, data, formatted) { cj( "#source_contact_qid" ).val( data[1] );
-                                }).bind( 'click', function( ) { cj( "#source_contact_qid" ).val(''); });
-    });
-    </script>
-    {/literal}
-    {if !$action or ( $action eq 1 ) or ( $action eq 2 ) }
-        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    {/if}
-      
-        {if $action eq 8} {* Delete action. *}
-            <table class="form-layout">
-             <tr>
-                <td colspan="2">
-                    <div class="status">{ts 1=$delName}Are you sure you want to delete '%1'?{/ts}</div>
-                </td>
-             </tr>
-               
-        {elseif $action eq 1 or $action eq 2  or $action eq 4 or $context eq 'search' or $context eq 'smog'}
-            { if $activityTypeDescription }  
-                <div id="help">{$activityTypeDescription}</div>
-            {/if}
-
-            <table class="{if $action eq 4}crm-info-panel{else}form-layout{/if}">
-
-	     {if $action eq 4}
-            <h3>{$activityTypeName}</h3>
-	     {else}	   
-             {if $context eq 'standalone' or $context eq 'search' or $context eq 'smog'}
-                <tr class="crm-activity-form-block-activity_type_id">
-                   <td class="label">{$form.activity_type_id.label}</td><td class="view-value">{$form.activity_type_id.html}</td>
-                </tr>
-             {/if}
-	     {/if}
-	     
-	     {if $surveyActivity} 
-               <tr class="crm-activity-form-block-survey">
-                 <td class="label">{ts}Survey Title{/ts}</td><td class="view-value">{$surveyTitle}</td>
-               </tr>
-	     {/if}
-	     
-             <tr class="crm-activity-form-block-source_contact_id">
-                <td class="label">{$form.source_contact_id.label}</td>
-                <td class="view-value">
-                    {if $admin and $action neq 4}{$form.source_contact_id.html} {else} {$source_contact_value} {/if}
-                </td>
-             </tr>
-
-             <tr class="crm-activity-form-block-target_contact_id">
-             {if $single eq false}
-                <td class="label">{ts}With Contact(s){/ts}</td>
-                <td class="view-value" style="white-space: normal">{$with|escape}</td>
-             {elseif $action neq 4}
-                <td class="label">{ts}With Contact{/ts}</td>
-                <td>{$form.target_contact_id.html}</td>
-		     {else}
-                <td class="label">{ts}With Contact{/ts}</td>
-                <td class="view-value" style="white-space: normal">
-        			{foreach from=$target_contact key=id item=name}
-        			  <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$id"}">{$name}</a>;&nbsp;
-        			{/foreach}
-		        </td>
-             {/if}
-             </tr>
-             
-             <tr class="crm-activity-form-block-assignee_contact_id">
-             {if $action eq 4}
-                <td class="label">{ts}Assigned To{/ts}</td><td class="view-value">
-			    {foreach from=$assignee_contact key=id item=name}
-			        <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$id"}">{$name}</a>;&nbsp;
-			    {/foreach}
-                </td>
-             {else}
-                <td class="label">{ts}Assigned To{/ts}</td>
-                <td>{$form.assignee_contact_id.html}
-                   {edit}<span class="description">{ts}You can optionally assign this activity to someone. Assigned activities will appear in their Activities listing at CiviCRM Home.{/ts}
-                           {if $config->activityAssigneeNotification}
-                               <br />{ts}A copy of this activity will be emailed to each Assignee.{/ts}
-                           {/if}
-                         </span>
-                   {/edit}
-                </td>
-             {/if}
-             </tr>
-
-            {if $activityTypeFile}
-                {include file="CRM/$crmDir/Form/Activity/$activityTypeFile.tpl"}
-            {/if}
-
-             <tr class="crm-activity-form-block-subject">
-                <td class="label">{$form.subject.label}</td><td class="view-value">{$form.subject.html|crmReplace:class:huge}</td>
-             </tr>
-	     
-    	     {* CRM-7362 --add campaign to activities *}
-    	     {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" 
-    	     campaignTrClass="crm-activity-form-block-campaign_id"}
-
-    	     {* build engagement level CRM-7775 *}
-    	     {if $buildEngagementLevel}
-        	     <tr class="crm-activity-form-block-engagement_level">
-                         <td class="label">{$form.engagement_level.label}</td>
-        		 <td class="view-value">{$form.engagement_level.html}</td>
-                     </tr>
-    	     {/if}
-	     
-             <tr class="crm-activity-form-block-location">
-                <td class="label">{$form.location.label}</td><td class="view-value">{$form.location.html|crmReplace:class:huge}</td>
-             </tr> 
-             <tr class="crm-activity-form-block-activity_date_time">
-                <td class="label">{$form.activity_date_time.label}</td>
-                {if $action neq 4}
-                    <td class="view-value">{include file="CRM/common/jcalendar.tpl" elementName=activity_date_time}</td>
-                {else}
-                    <td class="view-value">{$form.activity_date_time.html|crmDate}</td>
-                {/if}
-             </tr>
-             <tr class="crm-activity-form-block-duration">
-                <td class="label">{$form.duration.label}</td>
-                <td class="view-value">
-                    {$form.duration.html}
-                    {if $action neq 4}<span class="description">{ts}Total time spent on this activity (in minutes).{/ts}{/if}
-                </td>
-             </tr> 
-             <tr class="crm-activity-form-block-status_id">
-                <td class="label">{$form.status_id.label}</td><td class="view-value">{$form.status_id.html}</td>
-             </tr> 
-             <tr class="crm-activity-form-block-details">
-               <td class="label">{$form.details.label}</td>
-        	        {if $activityTypeName eq "Print PDF Letter"}
-            		  <td class="view-value">
-                          {* If using plain textarea, assign class=huge to make input large enough. *}
-                          {if $defaultWysiwygEditor eq 0}{$form.details.html|crmReplace:class:huge}{else}{$form.details.html}{/if}
-            		  </td>
-            		{else}
-            	      <td class="view-value">
-                          {* If using plain textarea, assign class=huge to make input large enough. *}
-                          {if $defaultWysiwygEditor eq 0}{$form.details.html|crmStripAlternatives|crmReplace:class:huge}{else}{$form.details.html|crmStripAlternatives}{/if}
-            		  </td>
-            		{/if}
-             </tr> 
-             <tr class="crm-activity-form-block-priority_id">
-                <td class="label">{$form.priority_id.label}</td><td class="view-value">{$form.priority_id.html}</td>
-             </tr>
-	     {if $surveyActivity } 
-               <tr class="crm-activity-form-block-result">
-                 <td class="label">{$form.result.label}</td><td class="view-value">{$form.result.html}</td>
-               </tr>
-	     {/if}
-             {if $form.tag.html}
-                 <tr class="crm-activity-form-block-tag">
-                    <td class="label">{$form.tag.label}</td>
-                    <td class="view-value"><div class="crm-select-container">{$form.tag.html}</div>
-                        {literal}
-                        <script type="text/javascript">
-                            cj("select[multiple]").crmasmSelect({
-                                addItemTarget: 'bottom',
-                                animate: true,
-                                highlight: true,
-                                sortable: true,
-                                respectParents: true
-                            });
-                        </script>
-                        {/literal}
-                    </td>
-                 </tr>
-             {/if}
-             
-             {if $tagsetInfo_activity}
-                <tr class="crm-activity-form-block-tag_set"><td colspan="2">{include file="CRM/common/Tag.tpl" tagsetType='activity'}</td></tr>
-             {/if}
-
-             {* start of code for profile injection*}
-             <tr class="crm-activity-form-profle">
-                <td colspan="2"><div id="crm-activity-profile"></div></td>
-             </tr>
-             {* end of code for profile injection*}
-
-             {if $action neq 4 OR $viewCustomData} 
-                 <tr class="crm-activity-form-block-custom_data">
-                    <td colspan="2">
-    	            {if $action eq 4} 
-                        {include file="CRM/Custom/Page/CustomDataView.tpl"}
-                    {else}
-                        <div id="customData"></div>
-                    {/if} 
-                    </td>
-                 </tr>
-             {/if}
-             
-             {if $action eq 4 AND $currentAttachmentURL}
-                {include file="CRM/Form/attachment.tpl"}{* For view action the include provides the row and cells. *}
-             {elseif $action eq 1 OR $action eq 2}
-                 <tr class="crm-activity-form-block-attachment">
-                    <td colspan="2">
-                        {include file="CRM/Form/attachment.tpl"}
-                    </td>
-                 </tr>
-             {/if}
-
-             {if $action neq 4} {* Don't include "Schedule Follow-up" section in View mode. *}
-                 <tr class="crm-activity-form-block-schedule_followup">
-                    <td colspan="2">
-                     	<div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-closed">
-						 <div class="crm-accordion-header">
-						  <div class="icon crm-accordion-pointer"></div>
-							{ts}Schedule Follow-up{/ts}                    
-						  </div><!-- /.crm-accordion-header -->
-					 	<div class="crm-accordion-body">
-                        <table class="form-layout-compressed">
-                           <tr><td class="label">{ts}Schedule Follow-up Activity{/ts}</td>
-                               <td>{$form.followup_activity_type_id.html}&nbsp;{$form.interval.label}&nbsp;{$form.interval.html}&nbsp;{$form.interval_unit.html}                          </td>
-                           </tr>
-                           <tr>
-                              <td class="label">{$form.followup_activity_subject.label}</td>
-                              <td>{$form.followup_activity_subject.html|crmReplace:class:huge}</td>
-                           </tr>
-                        </table>
-                       </div><!-- /.crm-accordion-body -->
-					 </div><!-- /.crm-accordion-wrapper -->
-					{literal} 
-					<script type="text/javascript">
-					cj(function() {
-					   cj().crmaccordions(); 
-					});
-					</script>
-					{/literal}
-					 
-					 </td>
-                 </tr>
-             {/if}
-        {/if} {* End Delete vs. Add / Edit action *}
-        </table>   
-	    <div class="crm-submit-buttons">
-            {if $action eq 4 && $activityTName neq 'Inbound Email'} 
-	            {if !$context }
-	                {assign var="context" value='activity'}
-	            {/if}
-	            {if $permission EQ 'edit'}
-		            {assign var='urlParams' value="reset=1&atype=$atype&action=update&reset=1&id=$entityID&cid=$contactId&context=$context"}
-		            {if ($context eq 'fulltext' || $context eq 'search') && $searchKey}
-		                {assign var='urlParams' value="reset=1&atype=$atype&action=update&reset=1&id=$entityID&cid=$contactId&context=$context&key=$searchKey"}
-		            {/if}
-                    <a href="{crmURL p='civicrm/activity/add' q=$urlParams}" class="edit button" title="{ts}Edit{/ts}"><span><div class="icon edit-icon"></div>{ts}Edit{/ts}</span></a>
-                 {/if}
-                 
-                 {if call_user_func(array('CRM_Core_Permission','check'), 'delete activities')}
-		            {assign var='urlParams' value="reset=1&atype=$atype&action=delete&reset=1&id=$entityID&cid=$contactId&context=$context"}
-		            {if ($context eq 'fulltext' || $context eq 'search') && $searchKey}
-		                {assign var='urlParams' value="reset=1&atype=$atype&action=delete&reset=1&id=$entityID&cid=$contactId&context=$context&key=$searchKey"}	
-		            {/if}
-                    <a href="{crmURL p='civicrm/contact/view/activity' q=$urlParams}" class="delete button" title="{ts}Delete{/ts}"><span><div class="icon delete-icon"></div>{ts}Delete{/ts}</span></a>
-                 {/if}
-	        {/if}
-            {include file="CRM/common/formButtons.tpl" location="bottom"}
-	    </div>
-
-    {include file="CRM/Case/Form/ActivityToCase.tpl"}
-
-    {if $action eq 1 or $action eq 2 or $context eq 'search' or $context eq 'smog'}
-       {*include custom data js file*}
-       {include file="CRM/common/customData.tpl"}
-        {literal}
-        <script type="text/javascript">
-       	cj(document).ready(function() {
-    		{/literal}
-                {if $customDataSubType}
-                    buildCustomData( '{$customDataType}', {$customDataSubType} );
-                {else}
-                    buildCustomData( '{$customDataType}' );
-                {/if}
-    		{literal}
-    	});
-
-        </script>
-        {/literal}
-    {/if}
-    {if ! $form.case_select}
-        {include file="CRM/common/formNavigate.tpl"}
-    {/if}
-    </div>{* end of form block*}
-{/if} {* end of snippet if*}
diff --git a/tools/drupal/modules/civicrm_ICIRR/templates/ICIRR/Form/Profile.tpl b/tools/drupal/modules/civicrm_ICIRR/templates/ICIRR/Form/Profile.tpl
deleted file mode 100644
index 95a24a18c579ba493701416d8b2a96c8965c897e..0000000000000000000000000000000000000000
--- a/tools/drupal/modules/civicrm_ICIRR/templates/ICIRR/Form/Profile.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.1                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2011                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-
-{if $profileFields}
-    <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-open">
-    <div class="crm-accordion-header">
-        <div class="icon crm-accordion-pointer"></div>
-        {ts}{$profileTitle}{/ts}                    
-    </div><!-- /.crm-accordion-header -->
-    <div class="crm-accordion-body">
- 	    {* here build the profile fields *}
-        <table class="form-layout-compressed">
-        {foreach from=$profileFields item=field key=fieldName}
-            <tr class="{$field.data_type} {$fieldName}">
-                <td class='label'>{$form.$fieldName.label}</td>
-                <td>
-                {if ( $field.data_type eq 'Date') or 
-                    ( $fieldName eq 'birth_date' ) or (  $fieldName eq 'deceased_date' ) }
-                    {if $action eq 1 or $action eq 2}
-                        {include file="CRM/common/jcalendar.tpl" elementName=$fieldName}
-                    {else}
-                        {$form.$fieldName.html}
-                    {/if}
-                {else}
-                   {$form.$fieldName.html}
-                {/if}
-		        {if $field.html_type eq 'Autocomplete-Select'}
-		            {include file="CRM/Custom/Form/AutoComplete.tpl" element_name = field[`$fieldName`]}
-                {/if}
-		        </td>
-            </tr> 
-        {/foreach}
-        </table>
-    </div><!-- /.crm-accordion-body -->
-    </div><!-- /.crm-accordion-wrapper -->
-
-    {literal} 
-    <script type="text/javascript">
-    cj(function() {
-        cj().crmaccordions(); 
-     });
-    </script>
-    {/literal}
-{/if}
-