diff --git a/groups/_celestial-flashpoint.yml b/groups/_celestial-flashpoint.yml
deleted file mode 100644
index 132fa5ff..00000000
--- a/groups/_celestial-flashpoint.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-types:
-  - 1071
diff --git a/groups/_celestial-orbital_target.yml b/groups/_celestial-orbital_target.yml
deleted file mode 100644
index 3789f322..00000000
--- a/groups/_celestial-orbital_target.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-types:
-  - 1198
diff --git a/groups/_celestial.yml b/groups/_celestial.yml
index 7859885f..7139cc48 100644
--- a/groups/_celestial.yml
+++ b/groups/_celestial.yml
@@ -26,8 +26,6 @@ types:
   - 897
   - 920
   - 988
-  - 1071
-  - 1198
   - 1316
   - 1704
   - 1882
diff --git a/groups/_charge-survey_probe.yml b/groups/_charge-survey_probe.yml
deleted file mode 100644
index ffcaed49..00000000
--- a/groups/_charge-survey_probe.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-types:
-  - 492
diff --git a/groups/_charge.yml b/groups/_charge.yml
index 0aa310e7..4505f98e 100644
--- a/groups/_charge.yml
+++ b/groups/_charge.yml
@@ -2,7 +2,6 @@
 types:
   - 90
   - 479
-  - 492
   - 548
   - 863
   - 864
diff --git a/groups/_deployable-structures.yml b/groups/_deployable-structures.yml
deleted file mode 100644
index b7ffda98..00000000
--- a/groups/_deployable-structures.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-types:
-  - 1312
diff --git a/groups/_deployable.yml b/groups/_deployable.yml
index 5d2e7054..ba8aefdd 100644
--- a/groups/_deployable.yml
+++ b/groups/_deployable.yml
@@ -1,14 +1,10 @@
 ---
 types:
   - 361
-  - 1149
   - 1246
   - 1247
   - 1249
   - 1250
   - 1273
-  - 1274
   - 1275
   - 1276
-  - 1297
-  - 1312
diff --git a/groups/_drone.yml b/groups/_drone.yml
index 72c964b7..779bc9b3 100644
--- a/groups/_drone.yml
+++ b/groups/_drone.yml
@@ -3,9 +3,7 @@ types:
   - 100
   - 101
   - 544
-  - 549
   - 639
   - 640
   - 641
-  - 1023
   - 1159
diff --git a/groups/_orbitals.yml b/groups/_orbitals.yml
index eb30390e..62faa6e0 100644
--- a/groups/_orbitals.yml
+++ b/groups/_orbitals.yml
@@ -1,5 +1,4 @@
 ---
 types:
   - 1025
-  - 1073
   - 1106
diff --git a/groups/_planetary_interaction.yml b/groups/_planetary_interaction.yml
deleted file mode 100644
index 496bcd34..00000000
--- a/groups/_planetary_interaction.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-types:
-  - 1081
-  - 1082
diff --git a/groups/all.yml b/groups/all.yml
index 1b6ba430..c95ca9e7 100644
--- a/groups/all.yml
+++ b/groups/all.yml
@@ -1,4 +1,7 @@
 ---
+types:
+  - 1165
+
 include:
   - _asteroid
   - _celestial
@@ -9,7 +12,6 @@ include:
   - _fighter
   - _npc
   - _orbitals
-  - _planetary_interaction
   - _ship
   - _starbase
   - _sovereignty_structures
diff --git a/groups/common-pvp.yml b/groups/common-pvp.yml
index 9fe22b71..e5acab2d 100644
--- a/groups/common-pvp.yml
+++ b/groups/common-pvp.yml
@@ -5,4 +5,3 @@ include:
   - _deployable
   - gates
   - _station
-  - _deployable-structures
diff --git a/groups/drones-fighters.yml b/groups/drones-fighters.yml
index 81933c91..5ab89ac6 100644
--- a/groups/drones-fighters.yml
+++ b/groups/drones-fighters.yml
@@ -1,7 +1,3 @@
 ---
-types:
-  - 549
-  - 1023
-
 include:
   - _fighter