diff --git a/states/top.sls b/states/top.sls
index 8482982..0865815 100644
--- a/states/top.sls
+++ b/states/top.sls
@@ -25,6 +25,11 @@ base:
     - sudo
     - users
 
+  # Server
+  '* and not *pc*':
+    - match: compound
+    - ssh
+
   # Laptop w/ Gnome3
   '*pc*':
     - desktop.cinnamon
@@ -33,21 +38,9 @@ base:
     - user_policies
     - signal
 
-  'mikepc*':
-    - extras.mikepc
-
-  # Test Systems
-  'test*':
-    - ssh
-
-  # Dev Systems
-  'dev*':
-    - ssh
-
-  # TODO: Temporary relocation
-  'media*':
-    - ssh
   'irc*':
-    - ssh
     - irssi
     - webapps
+
+  'mikepc*':
+    - extras.mikepc