diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json
index a8e2a0cadc..511bbb0627 100644
--- a/assets/common/npc_names.json
+++ b/assets/common/npc_names.json
@@ -251,22 +251,10 @@
                 "keyword": "sabertooth",
                 "generic": "Sabertooth Tiger"
             },
-            "viper": {
-                "keyword": "viper",
-                "generic": "Lizard"
-            },
             "tuskram": {
                 "keyword": "tuskram",
                 "generic": "Tusk Ram"
             },
-            "alligator": {
-                "keyword": "alligator",
-                "generic": "Alligator"
-            },
-            "monitor": {
-                "keyword": "monitor",
-                "generic": "Monitor Lizard"
-            },
             "lion": {
                 "keyword": "lion",
                 "generic": "Lion"
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_lb.vox b/assets/voxygen/voxel/npc/alligator/female/foot_lb.vox
deleted file mode 100644
index 0d65b2d87e..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/foot_lb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad021a43bb437157f4087c2ffa5c59cbf352da19063f69acc312fb8bb16e9836
-size 1224
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_lf.vox b/assets/voxygen/voxel/npc/alligator/female/foot_lf.vox
deleted file mode 100644
index 0537c4aa55..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/foot_lf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa76d106bdccceffc575509e44db99bb81b68501216e6d3703ac5dce07c2cf1b
-size 1160
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_rb.vox b/assets/voxygen/voxel/npc/alligator/female/foot_rb.vox
deleted file mode 100644
index 6030b818cc..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/foot_rb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d801090612e95b24caa5cbe28907cdf33e3a88f6699f5115c9b4ed4792eccff6
-size 1224
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_rf.vox b/assets/voxygen/voxel/npc/alligator/female/foot_rf.vox
deleted file mode 100644
index c541061a5d..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/foot_rf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ad2041d642feb8fbd90bcef57ae64c5a6f769b772809782c47f10336cf3dca9
-size 1160
diff --git a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox b/assets/voxygen/voxel/npc/alligator/female/head_lower.vox
deleted file mode 100644
index c038b75182..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b947ca485d6ac5ab921a5ff88f0ec63638df6bc2230f109edc3f2e57c8cc08a9
-size 1672
diff --git a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox b/assets/voxygen/voxel/npc/alligator/female/head_upper.vox
deleted file mode 100644
index 5b6d99dbca..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d4d1a41ead3993911ca3b678e13fe85d742bf2caf87a06f24af0d4721d739ba
-size 2608
diff --git a/assets/voxygen/voxel/npc/alligator/female/jaw.vox b/assets/voxygen/voxel/npc/alligator/female/jaw.vox
deleted file mode 100644
index ca45806ac0..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/jaw.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a76b9301a6990c4b7396d4737a390d0be922ec1fc6ee855f7563a43705c1faa3
-size 1464
diff --git a/assets/voxygen/voxel/npc/alligator/female/tail.vox b/assets/voxygen/voxel/npc/alligator/female/tail.vox
deleted file mode 100644
index 09971538d9..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/tail.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d40ceecef9ffa262b29bca85b2e907db4469beb0d09faad2ac3ad5fb2e7bbec0
-size 1280
diff --git a/assets/voxygen/voxel/npc/alligator/female/torso_back.vox b/assets/voxygen/voxel/npc/alligator/female/torso_back.vox
deleted file mode 100644
index 986397b65e..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/torso_back.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa83f2237f49e51069411be2d89d549032db8ba6a87a9bdf0538220a0feebc69
-size 2128
diff --git a/assets/voxygen/voxel/npc/alligator/female/torso_front.vox b/assets/voxygen/voxel/npc/alligator/female/torso_front.vox
deleted file mode 100644
index 9a8d20e70e..0000000000
--- a/assets/voxygen/voxel/npc/alligator/female/torso_front.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6180455d9d3b9b82adde8b8a9016124a19e39a148304b9a765d1a4b79f316079
-size 2832
diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_lb.vox b/assets/voxygen/voxel/npc/alligator/male/foot_lb.vox
deleted file mode 100644
index 0d65b2d87e..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/foot_lb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad021a43bb437157f4087c2ffa5c59cbf352da19063f69acc312fb8bb16e9836
-size 1224
diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_lf.vox b/assets/voxygen/voxel/npc/alligator/male/foot_lf.vox
deleted file mode 100644
index 0537c4aa55..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/foot_lf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa76d106bdccceffc575509e44db99bb81b68501216e6d3703ac5dce07c2cf1b
-size 1160
diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_rb.vox b/assets/voxygen/voxel/npc/alligator/male/foot_rb.vox
deleted file mode 100644
index 6030b818cc..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/foot_rb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d801090612e95b24caa5cbe28907cdf33e3a88f6699f5115c9b4ed4792eccff6
-size 1224
diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_rf.vox b/assets/voxygen/voxel/npc/alligator/male/foot_rf.vox
deleted file mode 100644
index c541061a5d..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/foot_rf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ad2041d642feb8fbd90bcef57ae64c5a6f769b772809782c47f10336cf3dca9
-size 1160
diff --git a/assets/voxygen/voxel/npc/alligator/male/head_lower.vox b/assets/voxygen/voxel/npc/alligator/male/head_lower.vox
deleted file mode 100644
index c038b75182..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/head_lower.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b947ca485d6ac5ab921a5ff88f0ec63638df6bc2230f109edc3f2e57c8cc08a9
-size 1672
diff --git a/assets/voxygen/voxel/npc/alligator/male/head_upper.vox b/assets/voxygen/voxel/npc/alligator/male/head_upper.vox
deleted file mode 100644
index 5b6d99dbca..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/head_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d4d1a41ead3993911ca3b678e13fe85d742bf2caf87a06f24af0d4721d739ba
-size 2608
diff --git a/assets/voxygen/voxel/npc/alligator/male/jaw.vox b/assets/voxygen/voxel/npc/alligator/male/jaw.vox
deleted file mode 100644
index ca45806ac0..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/jaw.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a76b9301a6990c4b7396d4737a390d0be922ec1fc6ee855f7563a43705c1faa3
-size 1464
diff --git a/assets/voxygen/voxel/npc/alligator/male/tail.vox b/assets/voxygen/voxel/npc/alligator/male/tail.vox
deleted file mode 100644
index 09971538d9..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/tail.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d40ceecef9ffa262b29bca85b2e907db4469beb0d09faad2ac3ad5fb2e7bbec0
-size 1280
diff --git a/assets/voxygen/voxel/npc/alligator/male/torso_back.vox b/assets/voxygen/voxel/npc/alligator/male/torso_back.vox
deleted file mode 100644
index 986397b65e..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/torso_back.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa83f2237f49e51069411be2d89d549032db8ba6a87a9bdf0538220a0feebc69
-size 2128
diff --git a/assets/voxygen/voxel/npc/alligator/male/torso_front.vox b/assets/voxygen/voxel/npc/alligator/male/torso_front.vox
deleted file mode 100644
index 9a8d20e70e..0000000000
--- a/assets/voxygen/voxel/npc/alligator/male/torso_front.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6180455d9d3b9b82adde8b8a9016124a19e39a148304b9a765d1a4b79f316079
-size 2832
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_lb.vox b/assets/voxygen/voxel/npc/monitor/female/foot_lb.vox
deleted file mode 100644
index e87a1559d6..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/foot_lb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca3cadf65632c1f33be01defde7e9aa0b40a3c73487d13798835a10a4cc69766
-size 1188
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_lf.vox b/assets/voxygen/voxel/npc/monitor/female/foot_lf.vox
deleted file mode 100644
index f78b3f308e..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/foot_lf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:531f74d9e976f2c5eeb901e7119d51fd9b884d9f6808574ee4adcd1208a505a4
-size 1156
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_rb.vox b/assets/voxygen/voxel/npc/monitor/female/foot_rb.vox
deleted file mode 100644
index 662a277056..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/foot_rb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:623316d753a546cba938b90dcc2c7cc4d439c556120f4f77d1e3e9bb6576fd90
-size 1188
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_rf.vox b/assets/voxygen/voxel/npc/monitor/female/foot_rf.vox
deleted file mode 100644
index e87a1559d6..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/foot_rf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca3cadf65632c1f33be01defde7e9aa0b40a3c73487d13798835a10a4cc69766
-size 1188
diff --git a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox
deleted file mode 100644
index 64218a9882..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c56d9b653b3024884c90f54ce0ae7ec0d025b5168b56ff827d474ea5cb9aff2
-size 1488
diff --git a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox b/assets/voxygen/voxel/npc/monitor/female/head_upper.vox
deleted file mode 100644
index 1813e3348e..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aeac9770d83233807c78484e3b5b5735d3b1cd64b221463185f7afe3b7fa985c
-size 1968
diff --git a/assets/voxygen/voxel/npc/monitor/female/jaw.vox b/assets/voxygen/voxel/npc/monitor/female/jaw.vox
deleted file mode 100644
index 38f4a2cad6..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/jaw.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8f1ed4297a32a8d82134b413d7d12f8c872b7219ea8816be43dde34062a6ac2
-size 1240
diff --git a/assets/voxygen/voxel/npc/monitor/female/tail.vox b/assets/voxygen/voxel/npc/monitor/female/tail.vox
deleted file mode 100644
index 464f0d7cea..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/tail.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c820ac6d830720b16d2d6a189e1f1bb0ee53eae05ab1d4a649c7b3e0b8a9c80
-size 1216
diff --git a/assets/voxygen/voxel/npc/monitor/female/torso_back.vox b/assets/voxygen/voxel/npc/monitor/female/torso_back.vox
deleted file mode 100644
index 2c356a2536..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/torso_back.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31f836170639602f91dd8b69fe3e1050470ae18675c7dfb70beea22e79df4dfc
-size 1704
diff --git a/assets/voxygen/voxel/npc/monitor/female/torso_front.vox b/assets/voxygen/voxel/npc/monitor/female/torso_front.vox
deleted file mode 100644
index 7dcc04845d..0000000000
--- a/assets/voxygen/voxel/npc/monitor/female/torso_front.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5bc8b1ca8dc4769726317b163dc1490478eb0d594d3dbbcc6f5c23240a07c1a
-size 2064
diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_lb.vox b/assets/voxygen/voxel/npc/monitor/male/foot_lb.vox
deleted file mode 100644
index e87a1559d6..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/foot_lb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca3cadf65632c1f33be01defde7e9aa0b40a3c73487d13798835a10a4cc69766
-size 1188
diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_lf.vox b/assets/voxygen/voxel/npc/monitor/male/foot_lf.vox
deleted file mode 100644
index f78b3f308e..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/foot_lf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:531f74d9e976f2c5eeb901e7119d51fd9b884d9f6808574ee4adcd1208a505a4
-size 1156
diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_rb.vox b/assets/voxygen/voxel/npc/monitor/male/foot_rb.vox
deleted file mode 100644
index 662a277056..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/foot_rb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:623316d753a546cba938b90dcc2c7cc4d439c556120f4f77d1e3e9bb6576fd90
-size 1188
diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_rf.vox b/assets/voxygen/voxel/npc/monitor/male/foot_rf.vox
deleted file mode 100644
index e87a1559d6..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/foot_rf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca3cadf65632c1f33be01defde7e9aa0b40a3c73487d13798835a10a4cc69766
-size 1188
diff --git a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox b/assets/voxygen/voxel/npc/monitor/male/head_lower.vox
deleted file mode 100644
index 64218a9882..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c56d9b653b3024884c90f54ce0ae7ec0d025b5168b56ff827d474ea5cb9aff2
-size 1488
diff --git a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox b/assets/voxygen/voxel/npc/monitor/male/head_upper.vox
deleted file mode 100644
index 1813e3348e..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aeac9770d83233807c78484e3b5b5735d3b1cd64b221463185f7afe3b7fa985c
-size 1968
diff --git a/assets/voxygen/voxel/npc/monitor/male/jaw.vox b/assets/voxygen/voxel/npc/monitor/male/jaw.vox
deleted file mode 100644
index 38f4a2cad6..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/jaw.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8f1ed4297a32a8d82134b413d7d12f8c872b7219ea8816be43dde34062a6ac2
-size 1240
diff --git a/assets/voxygen/voxel/npc/monitor/male/tail.vox b/assets/voxygen/voxel/npc/monitor/male/tail.vox
deleted file mode 100644
index 464f0d7cea..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/tail.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c820ac6d830720b16d2d6a189e1f1bb0ee53eae05ab1d4a649c7b3e0b8a9c80
-size 1216
diff --git a/assets/voxygen/voxel/npc/monitor/male/torso_back.vox b/assets/voxygen/voxel/npc/monitor/male/torso_back.vox
deleted file mode 100644
index 2c356a2536..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/torso_back.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31f836170639602f91dd8b69fe3e1050470ae18675c7dfb70beea22e79df4dfc
-size 1704
diff --git a/assets/voxygen/voxel/npc/monitor/male/torso_front.vox b/assets/voxygen/voxel/npc/monitor/male/torso_front.vox
deleted file mode 100644
index 7dcc04845d..0000000000
--- a/assets/voxygen/voxel/npc/monitor/male/torso_front.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5bc8b1ca8dc4769726317b163dc1490478eb0d594d3dbbcc6f5c23240a07c1a
-size 2064
diff --git a/assets/voxygen/voxel/npc/viper/female/foot_lb.vox b/assets/voxygen/voxel/npc/viper/female/foot_lb.vox
deleted file mode 100644
index 6dccf5d2c6..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/foot_lb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a13a74c18cf49365cd38796cd579724ea259459aaa816071c12f275e3c04b4d4
-size 1196
diff --git a/assets/voxygen/voxel/npc/viper/female/foot_lf.vox b/assets/voxygen/voxel/npc/viper/female/foot_lf.vox
deleted file mode 100644
index d3d12d1f01..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/foot_lf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77df90d2f3af9f811e6ba8e77927081fed8c9d1999ad95c1181b3b051b18812d
-size 1172
diff --git a/assets/voxygen/voxel/npc/viper/female/foot_rb.vox b/assets/voxygen/voxel/npc/viper/female/foot_rb.vox
deleted file mode 100644
index e8b9ae89d7..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/foot_rb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f07e9f7aeee2cfe515ee80dacd70761ee87ec6591a28fed924f67d1123e4ab4
-size 1196
diff --git a/assets/voxygen/voxel/npc/viper/female/foot_rf.vox b/assets/voxygen/voxel/npc/viper/female/foot_rf.vox
deleted file mode 100644
index 6cd5a27c74..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/foot_rf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:599019b83cf9a5c1bfe7a6bd4496c8c152fe2b162ec54c157b92297201c5e186
-size 1172
diff --git a/assets/voxygen/voxel/npc/viper/female/head_lower.vox b/assets/voxygen/voxel/npc/viper/female/head_lower.vox
deleted file mode 100644
index 20b58d5e71..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/head_lower.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:452520e2dc069cf5d511a7c9627a04c19b029277658a2c9665ae97de758b203d
-size 1576
diff --git a/assets/voxygen/voxel/npc/viper/female/head_upper.vox b/assets/voxygen/voxel/npc/viper/female/head_upper.vox
deleted file mode 100644
index a7461711a1..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/head_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:931bcc829004378a692bb7b801dd9a6225a294bf9dbf1052fa21133eb0987142
-size 2552
diff --git a/assets/voxygen/voxel/npc/viper/female/jaw.vox b/assets/voxygen/voxel/npc/viper/female/jaw.vox
deleted file mode 100644
index c43ef3b36f..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/jaw.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5180038d764a1164f04dea23fd83a768892eac2fbc8293f12a80321e905113f4
-size 1272
diff --git a/assets/voxygen/voxel/npc/viper/female/tail.vox b/assets/voxygen/voxel/npc/viper/female/tail.vox
deleted file mode 100644
index 8ddb753fc7..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/tail.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d8751e41730e825a0325892538211169e34058889871edfc800aafc71247ae5
-size 1200
diff --git a/assets/voxygen/voxel/npc/viper/female/torso_back.vox b/assets/voxygen/voxel/npc/viper/female/torso_back.vox
deleted file mode 100644
index 3c178ac063..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/torso_back.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e93b005f1621f6389a7c966f44169611116f04b63297dc5032186ceb93befcd9
-size 2392
diff --git a/assets/voxygen/voxel/npc/viper/female/torso_front.vox b/assets/voxygen/voxel/npc/viper/female/torso_front.vox
deleted file mode 100644
index e5b8935ef4..0000000000
--- a/assets/voxygen/voxel/npc/viper/female/torso_front.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6b04470bcb3ad718c90c130c6ce30c3df5400ac997a0a76687dc8ad4d598f51
-size 3392
diff --git a/assets/voxygen/voxel/npc/viper/male/foot_lb.vox b/assets/voxygen/voxel/npc/viper/male/foot_lb.vox
deleted file mode 100644
index 6dccf5d2c6..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/foot_lb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a13a74c18cf49365cd38796cd579724ea259459aaa816071c12f275e3c04b4d4
-size 1196
diff --git a/assets/voxygen/voxel/npc/viper/male/foot_lf.vox b/assets/voxygen/voxel/npc/viper/male/foot_lf.vox
deleted file mode 100644
index d3d12d1f01..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/foot_lf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77df90d2f3af9f811e6ba8e77927081fed8c9d1999ad95c1181b3b051b18812d
-size 1172
diff --git a/assets/voxygen/voxel/npc/viper/male/foot_rb.vox b/assets/voxygen/voxel/npc/viper/male/foot_rb.vox
deleted file mode 100644
index e8b9ae89d7..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/foot_rb.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f07e9f7aeee2cfe515ee80dacd70761ee87ec6591a28fed924f67d1123e4ab4
-size 1196
diff --git a/assets/voxygen/voxel/npc/viper/male/foot_rf.vox b/assets/voxygen/voxel/npc/viper/male/foot_rf.vox
deleted file mode 100644
index 6cd5a27c74..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/foot_rf.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:599019b83cf9a5c1bfe7a6bd4496c8c152fe2b162ec54c157b92297201c5e186
-size 1172
diff --git a/assets/voxygen/voxel/npc/viper/male/head_lower.vox b/assets/voxygen/voxel/npc/viper/male/head_lower.vox
deleted file mode 100644
index 20b58d5e71..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/head_lower.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:452520e2dc069cf5d511a7c9627a04c19b029277658a2c9665ae97de758b203d
-size 1576
diff --git a/assets/voxygen/voxel/npc/viper/male/head_upper.vox b/assets/voxygen/voxel/npc/viper/male/head_upper.vox
deleted file mode 100644
index a7461711a1..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/head_upper.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:931bcc829004378a692bb7b801dd9a6225a294bf9dbf1052fa21133eb0987142
-size 2552
diff --git a/assets/voxygen/voxel/npc/viper/male/jaw.vox b/assets/voxygen/voxel/npc/viper/male/jaw.vox
deleted file mode 100644
index c43ef3b36f..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/jaw.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5180038d764a1164f04dea23fd83a768892eac2fbc8293f12a80321e905113f4
-size 1272
diff --git a/assets/voxygen/voxel/npc/viper/male/tail.vox b/assets/voxygen/voxel/npc/viper/male/tail.vox
deleted file mode 100644
index 8ddb753fc7..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/tail.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d8751e41730e825a0325892538211169e34058889871edfc800aafc71247ae5
-size 1200
diff --git a/assets/voxygen/voxel/npc/viper/male/torso_back.vox b/assets/voxygen/voxel/npc/viper/male/torso_back.vox
deleted file mode 100644
index 3c178ac063..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/torso_back.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e93b005f1621f6389a7c966f44169611116f04b63297dc5032186ceb93befcd9
-size 2392
diff --git a/assets/voxygen/voxel/npc/viper/male/torso_front.vox b/assets/voxygen/voxel/npc/viper/male/torso_front.vox
deleted file mode 100644
index e5b8935ef4..0000000000
--- a/assets/voxygen/voxel/npc/viper/male/torso_front.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6b04470bcb3ad718c90c130c6ce30c3df5400ac997a0a76687dc8ad4d598f51
-size 3392
diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
index 3536ec793d..3d6a1e91a9 100644
--- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
@@ -120,66 +120,6 @@
             central: ("npc.saber.female.tail"),
         ),
     ),
-    (Viper, Male): (
-        upper: (
-            offset: (-4.0, -5.5, -5.5),
-            central: ("npc.viper.male.head_upper"),
-        ),
-        lower: (
-            offset: (-3.0, -4.5, -2.5),
-            central: ("npc.viper.male.head_lower"),
-        ),
-        jaw: (
-            offset: (-3.0, -2.5, -1.0),
-            central: ("npc.viper.male.jaw"),
-        ),
-        torso_f: (
-            offset: (-5.0, -6.5, -3.5),
-            central: ("npc.viper.male.torso_front"),
-        ),
-        torso_b: (
-            offset: (-4.0, -7.0, -3.0),
-            central: ("npc.viper.male.torso_back"),
-        ),
-        ears: (
-            offset: (-3.0, -1.5, 1.0),
-            central: ("armor.empty"),
-        ),
-        tail: (
-            offset: (-1.0, -8.0, -1.5),
-            central: ("npc.viper.male.tail"),
-        ),
-    ),
-    (Viper, Female): (
-        upper: (
-            offset: (-4.0, -5.5, -5.5),
-            central: ("npc.viper.female.head_upper"),
-        ),
-        lower: (
-            offset: (-3.0, -4.5, -2.5),
-            central: ("npc.viper.female.head_lower"),
-        ),
-        jaw: (
-            offset: (-3.0, -2.5, -1.0),
-            central: ("npc.viper.male.jaw"),
-        ),
-        torso_f: (
-            offset: (-5.0, -6.5, -3.5),
-            central: ("npc.viper.female.torso_front"),
-        ),
-        torso_b: (
-            offset: (-4.0, -7.0, -3.0),
-            central: ("npc.viper.female.torso_back"),
-        ),
-        ears: (
-            offset: (-3.0, -1.5, 1.0),
-            central: ("armor.empty"),
-        ),
-        tail: (
-            offset: (-1.0, -5.0, -1.5),
-            central: ("npc.viper.female.tail"),
-        ),
-    ),
     (Tuskram, Male): (
         upper: (
             offset: (-4.0, -2.5, -7.0),
@@ -240,126 +180,6 @@
             central: ("npc.tuskram.male.tail"),
         ),
     ),
-    (Alligator, Male): (
-        upper: (
-            offset: (-4.0, -5.0, -6.0),
-            central: ("npc.alligator.male.head_upper"),
-        ),
-        lower: (
-            offset: (-4.0, -4.5, -1.5),
-            central: ("npc.alligator.male.head_lower"),
-        ),
-        jaw: (
-            offset: (-2.0, -7.0, -1.0),
-            central: ("npc.alligator.male.jaw"),
-        ),
-        torso_f: (
-            offset: (-5.0, -6.5, -2.5),
-            central: ("npc.alligator.male.torso_front"),
-        ),
-        torso_b: (
-            offset: (-4.0, -7.0, -2.0),
-            central: ("npc.alligator.male.torso_back"),
-        ),
-        ears: (
-            offset: (-3.0, -1.0, -0.5),
-            central: ("armor.empty"),
-        ),
-        tail: (
-            offset: (-2.0, -7.5, -1.5),
-            central: ("npc.alligator.male.tail"),
-        ),
-    ),
-    (Alligator, Female): (
-        upper: (
-            offset: (-4.0, -5.0, -6.0),
-            central: ("npc.alligator.female.head_upper"),
-        ),
-        lower: (
-            offset: (-4.0, -4.5, -1.5),
-            central: ("npc.alligator.female.head_lower"),
-        ),
-        jaw: (
-            offset: (-2.0, -7.0, -1.0),
-            central: ("npc.alligator.female.jaw"),
-        ),
-        torso_f: (
-            offset: (-5.0, -6.5, -2.5),
-            central: ("npc.alligator.female.torso_front"),
-        ),
-        torso_b: (
-            offset: (-4.0, -7.0, -2.0),
-            central: ("npc.alligator.female.torso_back"),
-        ),
-        ears: (
-            offset: (-3.0, -1.0, -0.5),
-            central: ("armor.empty"),
-        ),
-        tail: (
-            offset: (-2.0, -7.5, -1.5),
-            central: ("npc.alligator.male.tail"),
-        ),
-    ),
-    (Monitor, Male): (
-        upper: (
-            offset: (-3.0, -6.5, -2.5),
-            central: ("npc.monitor.female.head_upper"),
-        ),
-        lower: (
-            offset: (-3.0, -4.5, -1.5),
-            central: ("npc.monitor.female.head_lower"),
-        ),
-        jaw: (
-            offset: (-2.0, -3.0, -1.0),
-            central: ("npc.monitor.male.jaw"),
-        ),
-        torso_f: (
-            offset: (-4.0, -6.5, -2.0),
-            central: ("npc.monitor.male.torso_front"),
-        ),
-        torso_b: (
-            offset: (-3.0, -6.5, -1.5),
-            central: ("npc.monitor.male.torso_back"),
-        ),
-        ears: (
-            offset: (-3.0, -1.0, -0.5),
-            central: ("armor.empty"),
-        ),
-        tail: (
-            offset: (-1.0, -6.5, -1.0),
-            central: ("npc.monitor.male.tail"),
-        ),
-    ),
-    (Monitor, Female): (
-        upper: (
-            offset: (-3.0, -6.5, -2.5),
-            central: ("npc.monitor.female.head_upper"),
-        ),
-        lower: (
-            offset: (-3.0, -4.5, -1.5),
-            central: ("npc.monitor.female.head_lower"),
-        ),
-        jaw: (
-            offset: (-2.0, -3.0, -1.0),
-            central: ("npc.monitor.male.jaw"),
-        ),
-        torso_f: (
-            offset: (-4.0, -6.5, -2.0),
-            central: ("npc.monitor.female.torso_front"),
-        ),
-        torso_b: (
-            offset: (-3.0, -6.5, -1.5),
-            central: ("npc.monitor.female.torso_back"),
-        ),
-        ears: (
-            offset: (-3.0, -1.0, -0.5),
-            central: ("armor.empty"),
-        ),
-        tail: (
-            offset: (-1.0, -6.5, -1.0),
-            central: ("npc.monitor.male.tail"),
-        ),
-    ),
     (Lion, Male): (
         upper: (
             offset: (-4.5, -5.0, -4.0),
diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
index a91a680737..03dada8111 100644
--- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
@@ -135,74 +135,6 @@
             lateral: ("npc.saber.female.foot_rb"),
         ),
     ),
-    (Viper, Male): (
-        leg_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.male.leg_lf"),
-        ),
-        leg_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.male.leg_rf"),
-        ),
-        leg_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.male.leg_lb"),
-        ),
-        leg_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.male.leg_rb"),
-        ),
-        foot_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.male.foot_lf"),
-        ),
-        foot_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.male.foot_rf"),
-        ),
-        foot_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.male.foot_lb"),
-        ),
-        foot_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.male.foot_rb"),
-        ),
-    ),
-    (Viper, Female): (
-        leg_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.female.leg_lf"),
-        ),
-        leg_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.female.leg_rf"),
-        ),
-        leg_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.female.leg_lb"),
-        ),
-        leg_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.female.leg_rb"),
-        ),
-        foot_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.female.foot_lf"),
-        ),
-        foot_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.viper.female.foot_rf"),
-        ),
-        foot_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.female.foot_lb"),
-        ),
-        foot_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.viper.female.foot_rb"),
-        ),
-    ),
     (Tuskram, Male): (
         leg_lf: (
             offset: (-1.5, -1.5, -4.5),
@@ -271,142 +203,6 @@
             lateral: ("npc.tuskram.female.foot_rb"),
         ),
     ),
-    (Alligator, Male): (
-        leg_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.male.leg_lf"),
-        ),
-        leg_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.male.leg_rf"),
-        ),
-        leg_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.male.leg_lb"),
-        ),
-        leg_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.male.leg_rb"),
-        ),
-        foot_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.male.foot_lf"),
-        ),
-        foot_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.male.foot_rf"),
-        ),
-        foot_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.male.foot_lb"),
-        ),
-        foot_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.male.foot_rb"),
-        ),
-    ),
-    (Alligator, Female): (
-        leg_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.female.leg_lf"),
-        ),
-        leg_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.female.leg_rf"),
-        ),
-        leg_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.female.leg_lb"),
-        ),
-        leg_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.female.leg_rb"),
-        ),
-        foot_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.female.foot_lf"),
-        ),
-        foot_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.alligator.female.foot_rf"),
-        ),
-        foot_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.female.foot_lb"),
-        ),
-        foot_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.alligator.female.foot_rb"),
-        ),
-    ),
-    (Monitor, Male): (
-        leg_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.male.leg_lf"),
-        ),
-        leg_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.male.leg_rf"),
-        ),
-        leg_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.male.leg_lb"),
-        ),
-        leg_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.male.leg_rb"),
-        ),
-        foot_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.male.foot_lf"),
-        ),
-        foot_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.male.foot_rf"),
-        ),
-        foot_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.male.foot_lb"),
-        ),
-        foot_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.male.foot_rb"),
-        ),
-    ),
-    (Monitor, Female): (
-        leg_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.female.leg_lf"),
-        ),
-        leg_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.female.leg_rf"),
-        ),
-        leg_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.female.leg_lb"),
-        ),
-        leg_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.female.leg_rb"),
-        ),
-        foot_lf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.female.foot_lf"),
-        ),
-        foot_rf: (
-            offset: (-1.5, -1.5, -2.5),
-            lateral: ("npc.monitor.female.foot_rf"),
-        ),
-        foot_lb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.female.foot_lb"),
-        ),
-        foot_rb: (
-            offset: (-1.5, -2.0, -3.5),
-            lateral: ("npc.monitor.female.foot_rb"),
-        ),
-    ),
     (Lion, Male): (
         leg_lf: (
             offset: (-1.5, -1.5, -2.5),
diff --git a/common/src/comp/body/quadruped_medium.rs b/common/src/comp/body/quadruped_medium.rs
index d4c310db74..b9a20dbe1f 100644
--- a/common/src/comp/body/quadruped_medium.rs
+++ b/common/src/comp/body/quadruped_medium.rs
@@ -29,10 +29,7 @@ impl From<Body> for super::Body {
 pub enum Species {
     Grolgar = 0,
     Saber = 1,
-    Viper = 2,
     Tuskram = 3,
-    Alligator = 4,
-    Monitor = 5,
     Lion = 6,
     Tarasque = 7,
 }
@@ -44,10 +41,7 @@ pub enum Species {
 pub struct AllSpecies<SpeciesMeta> {
     pub grolgar: SpeciesMeta,
     pub saber: SpeciesMeta,
-    pub viper: SpeciesMeta,
     pub tuskram: SpeciesMeta,
-    pub alligator: SpeciesMeta,
-    pub monitor: SpeciesMeta,
     pub lion: SpeciesMeta,
     pub tarasque: SpeciesMeta,
 }
@@ -60,23 +54,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
         match index {
             Species::Grolgar => &self.grolgar,
             Species::Saber => &self.saber,
-            Species::Viper => &self.viper,
             Species::Tuskram => &self.tuskram,
-            Species::Alligator => &self.alligator,
-            Species::Monitor => &self.monitor,
             Species::Lion => &self.lion,
             Species::Tarasque => &self.tarasque,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 8] = [
+pub const ALL_SPECIES: [Species; 5] = [
     Species::Grolgar,
     Species::Saber,
-    Species::Viper,
     Species::Tuskram,
-    Species::Alligator,
-    Species::Monitor,
     Species::Lion,
     Species::Tarasque,
 ];
diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs
index febfc12325..7a1193a1c1 100644
--- a/voxygen/src/anim/src/quadruped_medium/mod.rs
+++ b/voxygen/src/anim/src/quadruped_medium/mod.rs
@@ -137,120 +137,84 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
             head_upper: match (body.species, body.body_type) {
                 (Grolgar, _) => (12.0, 16.0),
                 (Saber, _) => (14.0, 12.0),
-                (Viper, _) => (14.0, 10.0),
                 (Tuskram, _) => (9.0, 12.0),
-                (Alligator, _) => (16.0, 11.0),
-                (Monitor, _) => (14.0, 6.0),
                 (Lion, _) => (12.5, 14.0),
                 (Tarasque, _) => (12.0, 19.0),
             },
             head_lower: match (body.species, body.body_type) {
                 (Grolgar, _) => (-4.0, -7.0),
                 (Saber, _) => (-6.0, 0.0),
-                (Viper, _) => (-3.0, -1.0),
                 (Tuskram, _) => (-3.0, -1.0),
-                (Alligator, _) => (-5.0, -4.0),
-                (Monitor, _) => (-3.0, -1.0),
                 (Lion, _) => (-5.0, -1.0),
                 (Tarasque, _) => (-5.0, -6.0),
             },
             jaw: match (body.species, body.body_type) {
                 (Grolgar, _) => (3.0, -5.0),
                 (Saber, _) => (2.0, -1.0),
-                (Viper, _) => (3.0, -2.0),
                 (Tuskram, _) => (2.0, -2.0),
-                (Alligator, _) => (6.0, -6.0),
-                (Monitor, _) => (4.0, -3.0),
                 (Lion, _) => (2.0, -3.0),
                 (Tarasque, _) => (4.0, -9.0),
             },
             tail: match (body.species, body.body_type) {
                 (Grolgar, _) => (-6.0, -2.0),
                 (Saber, _) => (-4.0, -2.0),
-                (Viper, _) => (-6.0, -1.0),
                 (Tuskram, _) => (-6.0, -2.0),
-                (Alligator, _) => (-7.0, -1.0),
-                (Monitor, _) => (-7.0, -1.0),
                 (Lion, _) => (-8.0, -6.0),
                 (Tarasque, _) => (-7.0, -2.0),
             },
             torso_back: match (body.species, body.body_type) {
                 (Grolgar, _) => (4.0, 11.0),
                 (Saber, _) => (4.0, 9.0),
-                (Viper, _) => (4.0, 7.0),
                 (Tuskram, _) => (4.0, 9.0),
-                (Alligator, _) => (4.0, 6.0),
-                (Monitor, _) => (4.0, 4.0),
                 (Lion, _) => (4.0, 10.0),
                 (Tarasque, _) => (4.0, 9.0),
             },
             torso_mid: match (body.species, body.body_type) {
                 (Grolgar, _) => (-7.0, 10.5),
                 (Saber, _) => (-7.0, 9.5),
-                (Viper, _) => (-7.0, 7.0),
                 (Tuskram, _) => (-7.0, 9.0),
-                (Alligator, _) => (-7.0, 6.0),
-                (Monitor, _) => (-7.0, 4.0),
                 (Lion, _) => (-9.0, 9.0),
                 (Tarasque, _) => (-7.0, 8.0),
             },
             ears: match (body.species, body.body_type) {
                 (Grolgar, _) => (-1.0, 5.0),
                 (Saber, _) => (-1.0, 6.0),
-                (Viper, _) => (10.0, 2.0),
                 (Tuskram, _) => (10.0, 2.0),
-                (Alligator, _) => (10.0, 2.0),
-                (Monitor, _) => (10.0, 2.0),
                 (Lion, _) => (-2.0, 4.0),
                 (Tarasque, _) => (1.5, -2.0),
             },
             leg_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, 6.0, 2.0),
                 (Saber, _) => (4.0, 6.0, 3.0),
-                (Viper, _) => (4.0, 6.0, 3.0),
                 (Tuskram, _) => (4.0, 6.0, 4.5),
-                (Alligator, _) => (4.0, 6.0, 3.0),
-                (Monitor, _) => (4.0, 6.0, 3.0),
                 (Lion, _) => (5.0, 6.0, 3.0),
                 (Tarasque, _) => (4.0, 6.0, 3.0),
             },
             leg_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, -4.0, 3.0),
                 (Saber, _) => (4.0, -6.0, 3.5),
-                (Viper, _) => (4.0, -4.0, 3.5),
                 (Tuskram, _) => (4.0, -8.0, 5.5),
-                (Alligator, _) => (4.0, -4.0, 3.5),
-                (Monitor, _) => (4.0, -6.0, 3.5),
                 (Lion, _) => (5.5, -8.0, 3.5),
                 (Tarasque, _) => (4.0, -8.0, 3.5),
             },
             feet_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, 6.0, 2.0),
                 (Saber, _) => (4.0, 6.0, 3.0),
-                (Viper, _) => (4.0, 6.0, 3.0),
                 (Tuskram, _) => (4.0, 6.0, 4.5),
-                (Alligator, _) => (4.0, 6.0, 3.0),
-                (Monitor, _) => (4.0, 6.0, 3.0),
                 (Lion, _) => (5.0, 6.0, 3.0),
                 (Tarasque, _) => (4.0, 6.0, 3.0),
             },
             feet_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, -4.0, 3.0),
                 (Saber, _) => (4.0, -6.0, 3.5),
-                (Viper, _) => (4.0, -4.0, 3.5),
                 (Tuskram, _) => (4.0, -8.0, 5.5),
-                (Alligator, _) => (4.0, -4.0, 3.5),
-                (Monitor, _) => (4.0, -6.0, 3.5),
                 (Lion, _) => (5.5, -8.0, 3.5),
                 (Tarasque, _) => (4.0, -8.0, 3.5),
             },
             height: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.2),
                 (Saber, _) => (1.0),
-                (Viper, _) => (0.7),
                 (Tuskram, _) => (1.0),
-                (Alligator, _) => (0.5),
-                (Monitor, _) => (0.4),
                 (Lion, _) => (1.4),
                 (Tarasque, _) => (1.1),
             },