diff --git a/src/apps.json b/src/apps.json
index e5adf7a8e..9f156a2f1 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1521,24 +1521,6 @@
       },
       "website": "http://cakephp.org"
     },
-    "Canon": {
-      "cats": [
-        40
-      ],
-      "icon": "Canon.png",
-      "website": "http://www.canon.com"
-    },
-    "Canon HTTP Server": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "CANON HTTP Server(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Canon.png",
-      "implies": "Canon",
-      "website": "http://www.canon.com"
-    },
     "Captch Me": {
       "cats": [
         16,
@@ -2390,15 +2372,6 @@
       "icon": "Debian.png",
       "website": "http://debian.org"
     },
-    "Decorum": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "DedeCMS": {
       "cats": [
         1
@@ -3115,15 +3088,6 @@
       "icon": "Fireblade.png",
       "website": "http://fireblade.com"
     },
-    "FlashCom": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "Flask": {
       "cats": [
         18,
@@ -3854,17 +3818,6 @@
       "script": "/graffiti\\.js",
       "website": "http://graffiticms.codeplex.com"
     },
-    "Grandstream": {
-      "cats": [
-        22,
-        39
-      ],
-      "headers": {
-        "Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "icon": "Grandstream.png",
-      "website": "http://www.grandstream.com"
-    },
     "Grav": {
       "cats": [
         1
@@ -3999,25 +3952,6 @@
       "icon": "HP.svg",
       "website": "http://hp.com"
     },
-    "HTTP Kit": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "^http-kit"
-      },
-      "implies": "Java",
-      "website": "http://http-kit.org"
-    },
-    "HTTP-Server": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "HTTP/2": {
       "cats": [
         19
@@ -4063,16 +3997,6 @@
       "script": "handlebars(?:\\.runtime)?(?:-v([\\d.]+?))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "http://handlebarsjs.com"
     },
-    "Happy ICS Server": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "implies": "OmniTouch 8660 My Teamwork",
-      "website": "http://example.com"
-    },
     "Haravan": {
       "cats": [
         6
@@ -4657,18 +4581,6 @@
       "implies": "JBoss Application Server",
       "website": "http://jboss.org/jbossweb"
     },
-    "JC-HTTPD": {
-      "cats": [
-        22
-      ],
-      "excludes": "Apache",
-      "headers": {
-        "Server": "JC-HTTPD(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "JC-HTTPD.png",
-      "implies": "Canon",
-      "website": "http://canon.com"
-    },
     "JET Enterprise": {
       "cats": [
         6
@@ -4920,17 +4832,6 @@
       "icon": "KISSmetrics.png",
       "website": "https://www.kissmetrics.com"
     },
-    "KS_HTTP": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "KS_HTTP\\/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "icon": "KS_HTTP.png",
-      "implies": "Canon",
-      "website": "http://www.canon.com"
-    },
     "Kajabi": {
       "cats": [
         6
@@ -5654,19 +5555,6 @@
       "icon": "mkdocs.png",
       "website": "http://www.mkdocs.org/"
     },
-    "MOBOTIX": {
-      "cats": [
-        39
-      ],
-      "icon": "MOBOTIX.png",
-      "meta": {
-        "author": "MOBOTIX AG\\;confidence:40",
-        "copyright": "MOBOTIX AG\\;confidence:40",
-        "publisher": "MOBOTIX AG\\;confidence:40"
-      },
-      "url": "control/userimage\\.html\\;confidence:70",
-      "website": "http://mobotix.com"
-    },
     "MODX": {
       "cats": [
         1
@@ -6406,16 +6294,6 @@
       "script": "/moon(?:\\.min)?\\.js$",
       "website": "http://moonjs.ga/"
     },
-    "Motion-httpd": {
-      "cats": [
-        22
-      ],
-      "excludes": "Apache",
-      "headers": {
-        "Server": "Motion-httpd(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://lavrsen.dk/foswiki/bin/view/Motion"
-    },
     "MotoCMS": {
       "cats": [
         1
@@ -7934,15 +7812,6 @@
       "icon": "Quill.png",
       "website": "http://quilljs.com"
     },
-    "RAID HTTPServer": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "RBS Change": {
       "cats": [
         1,
@@ -8049,15 +7918,6 @@
       "script": "raphael(?:-([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "http://dmitrybaranovskiy.github.io/raphael/"
     },
-    "Rapid Logic": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "Raspbian": {
       "cats": [
         28
@@ -10457,18 +10317,6 @@
       "icon": "Vimeo.png",
       "website": "http://vimeo.com"
     },
-    "Virata EmWeb": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1"
-      },
-      "implies": [
-        "HP"
-      ],
-      "website": "http://example.com"
-    },
     "VirtueMart": {
       "cats": [
         6
@@ -11513,15 +11361,6 @@
       "implies": "Brother",
       "website": "http://www.brother.com"
     },
-    "dwhttpd": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "e107": {
       "cats": [
         1
@@ -11547,16 +11386,6 @@
       "icon": "eDevice SmartStack.png",
       "website": "http://edevice.com"
     },
-    "eHTTP": {
-      "cats": [
-        22
-      ],
-      "headers": {
-        "Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
-      },
-      "implies": "HP ProCurve",
-      "website": "http://example.com"
-    },
     "eSyndiCat": {
       "cats": [
         1
diff --git a/src/icons/Canon.png b/src/icons/Canon.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/Canon.png and /dev/null differ
diff --git a/src/icons/Grandstream.png b/src/icons/Grandstream.png
deleted file mode 100644
index a347c58c9..000000000
Binary files a/src/icons/Grandstream.png and /dev/null differ
diff --git a/src/icons/JC-HTTPD.png b/src/icons/JC-HTTPD.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/JC-HTTPD.png and /dev/null differ
diff --git a/src/icons/KS_HTTP.png b/src/icons/KS_HTTP.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/KS_HTTP.png and /dev/null differ
diff --git a/src/icons/MOBOTIX.png b/src/icons/MOBOTIX.png
deleted file mode 100644
index a4574629c..000000000
Binary files a/src/icons/MOBOTIX.png and /dev/null differ