diff --git a/app/files/feed-metadata/defaults.json b/app/files/feed-metadata/defaults.json
index a6b537609..882aa02f1 100644
--- a/app/files/feed-metadata/defaults.json
+++ b/app/files/feed-metadata/defaults.json
@@ -462,56 +462,6 @@
       "cache_timestamp": "1495872685"
     }
   },
-  {
-    "Feed": {
-      "id": "31",
-      "name": "hosts-file.net - hphost - malwarebytes",
-      "provider": "hosts-file.net",
-      "url": "https://hosts-file.net/psh.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": false,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495872711"
-    }
-  },
-  {
-    "Feed": {
-      "id": "32",
-      "name": "hosts-file.net - hphost - malwarebytes - EMD classification ONLY",
-      "provider": "hosts-file.net",
-      "url": "https://hosts-file.net/emd.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": false,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495872734"
-    }
-  },
   {
     "Feed": {
       "id": "33",
@@ -1058,31 +1008,6 @@
       "cache_timestamp": "1514750887"
     }
   },
-  {
-    "Feed": {
-      "id": "59",
-      "name": "hpHosts - GRM only",
-      "provider": "hpHosts",
-      "url": "https://hosts-file.net/grm.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": false,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\"\\\\t\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1514750888"
-    }
-  },
   {
     "Feed": {
       "id": "60",
diff --git a/app/files/taxonomies b/app/files/taxonomies
index a0b003598..a6ce68a4b 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit a0b0035982bcf4e53fd6afe42edf762ddc1481fb
+Subproject commit a6ce68a4bf4be6015063adc0fa92015c69a4f871
diff --git a/app/files/warninglists b/app/files/warninglists
index 78590f352..067bd5846 160000
--- a/app/files/warninglists
+++ b/app/files/warninglists
@@ -1 +1 @@
-Subproject commit 78590f35269658cceb009d0fe282d5274e74ba89
+Subproject commit 067bd58464d843607a8452bc1f7c37903cc7f237