diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index 91acc55a8f..004a38e44a 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -12,12 +12,9 @@ abstract class PhabricatorApplication
   implements PhabricatorPolicyInterface {
 
   const GROUP_CORE            = 'core';
-  const GROUP_COMMUNICATION   = 'communication';
-  const GROUP_ORGANIZATION    = 'organization';
   const GROUP_UTILITIES       = 'util';
   const GROUP_ADMIN           = 'admin';
   const GROUP_DEVELOPER       = 'developer';
-  const GROUP_MISC            = 'misc';
 
   const TILE_INVISIBLE        = 'invisible';
   const TILE_HIDE             = 'hide';
@@ -27,12 +24,9 @@ abstract class PhabricatorApplication
   public static function getApplicationGroups() {
     return array(
       self::GROUP_CORE          => pht('Core Applications'),
-      self::GROUP_COMMUNICATION => pht('Communication'),
-      self::GROUP_ORGANIZATION  => pht('Organization'),
       self::GROUP_UTILITIES     => pht('Utilities'),
       self::GROUP_ADMIN         => pht('Administration'),
       self::GROUP_DEVELOPER     => pht('Developer Tools'),
-      self::GROUP_MISC          => pht('Miscellaneous Applications'),
     );
   }
 
@@ -147,7 +141,7 @@ abstract class PhabricatorApplication
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_MISC;
+    return self::GROUP_CORE;
   }
 
   public function getTitleGlyph() {
diff --git a/src/applications/calendar/application/PhabricatorApplicationCalendar.php b/src/applications/calendar/application/PhabricatorApplicationCalendar.php
index 18c6b12d11..3925792f81 100644
--- a/src/applications/calendar/application/PhabricatorApplicationCalendar.php
+++ b/src/applications/calendar/application/PhabricatorApplicationCalendar.php
@@ -24,10 +24,6 @@ final class PhabricatorApplicationCalendar extends PhabricatorApplication {
     return "\xE2\x8C\xA8";
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }
diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
index 018cae36c0..9ef90f6d33 100644
--- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
+++ b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
@@ -23,7 +23,7 @@ final class PhabricatorApplicationChatLog extends PhabricatorApplication {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
+    return self::GROUP_UTILITIES;
   }
 
  public function getRoutes() {
diff --git a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php b/src/applications/conpherence/application/PhabricatorApplicationConpherence.php
index d86cb67722..671066f011 100644
--- a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php
+++ b/src/applications/conpherence/application/PhabricatorApplicationConpherence.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class PhabricatorApplicationConpherence extends PhabricatorApplication {
 
   public function getBaseURI() {
@@ -21,10 +18,6 @@ final class PhabricatorApplicationConpherence extends PhabricatorApplication {
     return "\xE2\x9C\x86";
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function getEventListeners() {
     return array(
       new ConpherenceActionMenuEventListener(),
diff --git a/src/applications/feed/application/PhabricatorApplicationFeed.php b/src/applications/feed/application/PhabricatorApplicationFeed.php
index b30da72fe5..12e37a33e7 100644
--- a/src/applications/feed/application/PhabricatorApplicationFeed.php
+++ b/src/applications/feed/application/PhabricatorApplicationFeed.php
@@ -28,8 +28,4 @@ final class PhabricatorApplicationFeed extends PhabricatorApplication {
     );
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
 }
diff --git a/src/applications/herald/application/PhabricatorApplicationHerald.php b/src/applications/herald/application/PhabricatorApplicationHerald.php
index c72d73717c..b6dc4be7d8 100644
--- a/src/applications/herald/application/PhabricatorApplicationHerald.php
+++ b/src/applications/herald/application/PhabricatorApplicationHerald.php
@@ -27,7 +27,7 @@ final class PhabricatorApplicationHerald extends PhabricatorApplication {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
+    return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {
diff --git a/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php b/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php
index 999e20b646..a8d8d8302c 100644
--- a/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php
+++ b/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php
@@ -23,7 +23,7 @@ final class PhabricatorApplicationLegalpad extends PhabricatorApplication {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
+    return self::GROUP_UTILITIES;
   }
 
   public function isBeta() {
diff --git a/src/applications/meta/application/PhabricatorApplicationApplications.php b/src/applications/meta/application/PhabricatorApplicationApplications.php
index 847e0f2c2b..00ba761645 100644
--- a/src/applications/meta/application/PhabricatorApplicationApplications.php
+++ b/src/applications/meta/application/PhabricatorApplicationApplications.php
@@ -22,10 +22,6 @@ final class PhabricatorApplicationApplications extends PhabricatorApplication {
     return "\xE0\xBC\x84";
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ADMIN;
-  }
-
   public function getRoutes() {
     return array(
       '/applications/' => array(
diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorApplicationPeople.php
index d387b0f882..aebf1383d7 100644
--- a/src/applications/people/application/PhabricatorApplicationPeople.php
+++ b/src/applications/people/application/PhabricatorApplicationPeople.php
@@ -22,10 +22,6 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication {
     return pht('Sort of a social utility.');
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
-  }
-
   public function canUninstall() {
     return false;
   }
diff --git a/src/applications/phame/application/PhabricatorApplicationPhame.php b/src/applications/phame/application/PhabricatorApplicationPhame.php
index d254d871cb..e66e02c871 100644
--- a/src/applications/phame/application/PhabricatorApplicationPhame.php
+++ b/src/applications/phame/application/PhabricatorApplicationPhame.php
@@ -22,10 +22,6 @@ final class PhabricatorApplicationPhame extends PhabricatorApplication {
     return PhabricatorEnv::getDoclink('Phame User Guide');
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }
diff --git a/src/applications/pholio/application/PhabricatorApplicationPholio.php b/src/applications/pholio/application/PhabricatorApplicationPholio.php
index 500ee5098b..b93d825402 100644
--- a/src/applications/pholio/application/PhabricatorApplicationPholio.php
+++ b/src/applications/pholio/application/PhabricatorApplicationPholio.php
@@ -22,11 +22,6 @@ final class PhabricatorApplicationPholio extends PhabricatorApplication {
     return pht('Things before they were cool.');
   }
 
-  public function getApplicationGroup() {
-    // TODO: Move to CORE, this just keeps it out of the side menu.
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }
diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorApplicationPhriction.php
index 6fdc116c65..e6fc014ec7 100644
--- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php
+++ b/src/applications/phriction/application/PhabricatorApplicationPhriction.php
@@ -58,10 +58,6 @@ final class PhabricatorApplicationPhriction extends PhabricatorApplication {
     );
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function getApplicationOrder() {
     return 0.140;
   }
diff --git a/src/applications/ponder/application/PhabricatorApplicationPonder.php b/src/applications/ponder/application/PhabricatorApplicationPonder.php
index 0821533460..2e0279d0e8 100644
--- a/src/applications/ponder/application/PhabricatorApplicationPonder.php
+++ b/src/applications/ponder/application/PhabricatorApplicationPonder.php
@@ -37,10 +37,6 @@ final class PhabricatorApplicationPonder extends PhabricatorApplication {
     );
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }
diff --git a/src/applications/project/application/PhabricatorApplicationProject.php b/src/applications/project/application/PhabricatorApplicationProject.php
index 60c13fb62e..15268a75c1 100644
--- a/src/applications/project/application/PhabricatorApplicationProject.php
+++ b/src/applications/project/application/PhabricatorApplicationProject.php
@@ -22,10 +22,6 @@ final class PhabricatorApplicationProject extends PhabricatorApplication {
     return pht('Group stuff into big piles.');
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
-  }
-
   public function getRemarkupRules() {
     return array(
       new ProjectRemarkupRule(),
diff --git a/src/applications/releeph/application/PhabricatorApplicationReleeph.php b/src/applications/releeph/application/PhabricatorApplicationReleeph.php
index 79f7a24961..78691c3772 100644
--- a/src/applications/releeph/application/PhabricatorApplicationReleeph.php
+++ b/src/applications/releeph/application/PhabricatorApplicationReleeph.php
@@ -18,10 +18,6 @@ final class PhabricatorApplicationReleeph extends PhabricatorApplication {
     return 'releeph';
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
-  }
-
   public function isInstalled() {
     if (PhabricatorEnv::getEnvConfig('releeph.installed')) {
       return parent::isInstalled();