Remove removed modules from .profile file

CHANGELOG.txt

@@ -189,7 +189,6 @@ Attached RTs:
 
 UW Base Profile 7.x-1.5.5
 =========================
-
 Contrib module changes:
 - added CAPTCHA 7.x-1.0-beta2
 - updated CAS from 7.x-1.1 to 7.x-1.2
@@ -282,13 +281,11 @@ UW Base Profile 7.x-1.5.4
 
 UW Base Profile 7.x-1.5.3
 =========================
-
 Fixes to the menu pathauto fix module - it was leaving old node aliases behind
 
 
 UW Base Profile 7.x-1.5.2
 =========================
-
 #224094 by kpaxman: Event sorting fixed to be more consistent
 #226321 by kpaxman: Users can now display different types of lists
 #228782 by kpaxman: Add to the Home page banner description
@@ -307,13 +304,11 @@ UW Base Profile 7.x-1.5.2
 
 UW Base Profile 7.x-1.5.1
 =========================
-
 #235998 by kpaxman: Update global header and footer links for CPA
 
 
 UW Base Profile 7.x-1.5
 =======================
-
 #207237 by kolafson: IMCE strongarm variables set with Features are overridden on a fresh install (with nothing) - fixed
 #209596 by mnshantz: Ability to group contacts by user controlled vocabulary
 #214124 by kpaxman: Content Authors should be able to create twitter widgets
@@ -361,7 +356,6 @@ UW Base Profile 7.x-1.5
 
 UW Base Profile 7.x-1.4
 =======================
-
 #213841 by kpaxman: Display the friendly path in autocomplete to help users differentiate same-named links
 #217395 by kpaxman: Fix broken links when uploading a file containing spaces in the filename
 #213861 by kpaxman: Add "clone" option to actions tab for web pages
@@ -408,7 +402,6 @@ UW Base Profile 7.x-1.4
 
 UW Base Profile 7.x-1.3
 =======================
-
 #209535 by mnshantz: Change order of content types from most to least used
 #210127 by kpaxman: Implement property/attribute filters (WYSIWYG Filter put in place)
 #210139 by mnshantz: Users shouldn't be able to delete content easily - archive instead to avoid accidents
@@ -432,7 +425,6 @@ UW Base Profile 7.x-1.3
 
 UW Base Profile 7.x-1.2
 =======================
-
 #213864 by kpaxman: Fix for losing content when switching to source view
 #214021 by kpaxman: Added "not" functionality for promotional item placement
 #214024 by ccarigna: Added thumbnail images for events and news items

uw_base_profile.make

@@ -1118,4 +1118,3 @@ libraries[ckeditor][directory_name] = "ckeditor"
 libraries[colorpicker][download][type] = "svn"
 libraries[colorpicker][download][url] = "https://lauren.uwaterloo.ca/repos/wms/vendor/contrib/7.x/libraries/colorpicker/"
 libraries[colorpicker][directory_name] = "colorpicker"
-n/

uw_base_profile.profile

@@ -139,10 +139,6 @@ function uw_select_site_features_form() {
   $form['enable_content_types']['uw_ct_service'] = array(
     '#type' => 'checkbox',
     '#title' => st('Service'),
-  );
-    $form['enable_content_types']['uw_ct_student_award'] = array(
-    '#type' => 'checkbox',
-    '#title' => st('Student awards'),
   );
   $form['enable_content_types']['uw_ct_image_gallery'] = array(
     '#type' => 'checkbox',
@@ -278,7 +274,7 @@ function uw_create_default_content_form() {
   }
 
 /* Turn on term lock for profile and audience taxonomies */
-    if (module_exists('uw_vocab_audience') || ('uw_ct_person_profile') || ('uw_ct_project') || ('uw_ct_service') || ('uw_ct_student_award')) {
+    if (module_exists('uw_vocab_audience') || module_exists('uw_ct_person_profile') || module_exists('uw_ct_project') || module_exists('uw_ct_service') || module_exists('uw_ct_student_award')) {
         $form['add_vocab_pages'] = array(
         '#type' => 'fieldset',
         '#title' => st('Add terms to vocabularies'),
@@ -325,7 +321,7 @@ function uw_create_default_content_form() {
              '#default_value' => 1,
              );
         }
-         /* Add Service Audience vocabulary terms */
+        /* Add Service Audience vocabulary terms */
         if (module_exists('uw_ct_service')) {
             $form['add_vocab_pages']['serviceaudience'] = array(
              '#type' => 'checkbox',
@@ -341,48 +337,7 @@ function uw_create_default_content_form() {
              '#default_value' => 1,
              );
         }
-        /* Add Student Award Academic Degrees vocabulary terms */
-        if (module_exists('uw_ct_student_award')) {
-            $form['add_vocab_pages']['awarddegree'] = array(
-             '#type' => 'checkbox',
-             '#title' => st('Academic Degrees Vocabulary Terms'),
-             '#default_value' => 1,
-             );
-        }
-         /* Add Student Award Citizenship vocabulary terms */
-        if (module_exists('uw_ct_student_award')) {
-            $form['add_vocab_pages']['awardcitizenship'] = array(
-             '#type' => 'checkbox',
-             '#title' => st('Citizenship Vocabulary Terms'),
-             '#default_value' => 1,
-             );
-        }
-         /* Add Student Award Department vocabulary terms */
-        if (module_exists('uw_ct_student_award')) {
-            $form['add_vocab_pages']['awarddepartment'] = array(
-             '#type' => 'checkbox',
-             '#title' => st('Department Vocabulary Terms'),
-             '#default_value' => 1,
-             );
-        }
-         /* Add Student Award Categories vocabulary terms */
-        if (module_exists('uw_ct_student_award')) {
-            $form['add_vocab_pages']['awardcategory'] = array(
-             '#type' => 'checkbox',
-             '#title' => st('Student Award Categories Vocabulary Terms'),
-             '#default_value' => 1,
-             );
-        }
-         /* Add Student Award Term vocabulary terms */
-        if (module_exists('uw_ct_student_award')) {
-            $form['add_vocab_pages']['awardterm'] = array(
-             '#type' => 'checkbox',
-             '#title' => st('Student Award Term Vocabulary Terms'),
-             '#default_value' => 1,
-             );
-        }
-
-    /* Add Profile vocabulary terms */
+        /* Add Profile vocabulary terms */
         if (module_exists('uw_ct_person_profile')) {
              $form['add_vocab_pages']['profile'] = array(
               '#type' => 'checkbox',