diff --git a/sulu/sulu-vendorext/Makefile b/sulu/sulu-vendorext/Makefile
index b4595d974..995fa0928 100644
--- a/sulu/sulu-vendorext/Makefile
+++ b/sulu/sulu-vendorext/Makefile
@@ -22,16 +22,10 @@ define Build/Compile
 endef
 
 define Package/sulu-vendorext/install
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_CWMP.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_extra_info.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_guest_wifi_5.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_IOWRT_EU_MAPController.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_voip.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_wan.json $(1) sysmngr
-	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_guest_wifi_2_4.json $(1) sysmngr
-
 	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_firewall.json $(1) firewallmngr
+	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU.json $(1) sysmngr
+	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_GENEXIS_EU_wan.json $(1) sysmngr
+	$(BBFDM_INSTALL_MS_PLUGIN) ./extn/X_IOWRT_EU_MAPController.json $(1) sysmngr
 
 	$(CP) ./files/* $(1)/
 endef
diff --git a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_CWMP.json b/sulu/sulu-vendorext/extn/X_GENEXIS_EU_CWMP.json
deleted file mode 100644
index b1f085985..000000000
--- a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_CWMP.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-        "Device.DeviceInfo.X_GENEXIS_EU.CWMPManagementServer.": {
-                "type": "object",
-                "protocols": [
-                        "usp"
-                ],
-                "access": false,
-                "array": false,
-                "dependency": "file:/etc/config/cwmp",
-                "EnableCWMP": {
-                        "type": "boolean",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "cpe"
-                                                },
-                                                "option": {
-                                                        "name": "enable"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "log_to_console": {
-                        "type": "boolean",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "cpe"
-                                                },
-                                                "option": {
-                                                        "name": "log_to_console"
-                                                }
-                                        }
-                                }
-                        ]
-                }
-        },
-        "Device.DeviceInfo.X_GENEXIS_EU.CWMPManagementServer.acs.": {
-                "type": "object",
-                "version": "2.15",
-                "protocols": [
-                        "usp"
-                ],
-                "access": false,
-                "array": false,
-                "dependency": "file:/etc/config/cwmp",
-                "url": {
-                        "type": "string",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "acs"
-                                                },
-                                                "option": {
-                                                        "name": "url"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "userid": {
-                        "type": "string",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "acs"
-                                                },
-                                                "option": {
-                                                        "name": "userid"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "password": {
-                        "type": "string",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "acs"
-                                                },
-                                                "option": {
-                                                        "name": "passwd"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "periodic_interval_enable": {
-                        "type": "boolean",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "acs"
-                                                },
-                                                "option": {
-                                                        "name": "periodic_inform_enable"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "periodic_inform_interval": {
-                        "type": "int",
-                        "version": "2.15",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "cwmp",
-                                                "section": {
-                                                        "name": "acs"
-                                                },
-                                                "option": {
-                                                        "name": "periodic_inform_interval"
-                                                }
-                                        }
-                                }
-                        ]
-                }
-        }
-}
diff --git a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_extra_info.json b/sulu/sulu-vendorext/extn/X_GENEXIS_EU_extra_info.json
deleted file mode 100644
index 55e2f7b9c..000000000
--- a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_extra_info.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-    "Device.DeviceInfo.X_GENEXIS_EU.external_info.": {
-        "type": "object",
-        "version": "1.00",
-        "protocols": [
-            "cwmp",
-            "usp"
-        ],
-        "access": false,
-        "array": false,
-        "support_link": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "support_link"
-                        }
-                    }
-                }
-            ]
-        },
-        "faq_link": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "faq_link"
-                        }
-                    }
-                }
-            ]
-        },
-        "contact_link": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "contact_link"
-                        }
-                    }
-                }
-            ]
-        },
-        "contact_phone": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "contact_phone"
-                        }
-                    }
-                }
-            ]
-        },
-        "contact_times": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "contact_times"
-                        }
-                    }
-                }
-            ]
-        },
-        "livechat_link": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "livechat_link"
-                        }
-                    }
-                }
-            ]
-        },
-        "extra_info": {
-            "type": "string",
-            "version": "1.00",
-            "read": true,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "type": "uci",
-                    "uci": {
-                        "file": "heimgard",
-                        "section": {
-                            "name": "help_support"
-                        },
-                        "option": {
-                            "name": "extra_info"
-                        }
-                    }
-                }
-            ]
-        }
-    }
-}
diff --git a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_guest_wifi_2_4.json b/sulu/sulu-vendorext/extn/X_GENEXIS_EU_guest_wifi_2_4.json
deleted file mode 100644
index 76b73f3e2..000000000
--- a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_guest_wifi_2_4.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-        "Device.DeviceInfo.X_GENEXIS_EU.guest2.": {
-                "type": "object",
-                "version": "1.00",
-                "protocols": [
-                        "cwmp",
-                        "usp"
-                ],
-                "access": false,
-                "array": false,
-                "ssid": {
-                        "type": "string",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "ssid"
-                                                }
-                                        }
-
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "ssid"
-                                                }
-                                        }
-
-                                }
-                        ]
-                },
-                "encryption": {
-                        "type": "string",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "encryption"
-                                                }
-                                        }
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "encryption"
-                                                }
-                                        }
-                                }
-                        ]    
-                },
-                "key": {
-                        "type": "string",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "key"
-                                                }
-                                        }
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "key"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "enabled": {
-                        "type": "boolean",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "enabled"
-                                                }
-                                        }
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest2"
-                                                },
-                                                "option": {
-                                                        "name": "enabled"
-                                                }
-                                        }
-                                }
-                        ]
-                }
-
-
-        }
-}
diff --git a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_guest_wifi_5.json b/sulu/sulu-vendorext/extn/X_GENEXIS_EU_guest_wifi_5.json
deleted file mode 100644
index 7bd88981e..000000000
--- a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_guest_wifi_5.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-        "Device.DeviceInfo.X_GENEXIS_EU.guest5.": {
-                "type": "object",
-                "version": "1.00",
-                "protocols": [
-                        "cwmp",
-                        "usp"
-                ],
-                "access": false,
-                "array": false,
-                "ssid": {
-                        "type": "string",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "ssid"
-                                                }
-                                        }
-
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "ssid"
-                                                }
-                                        }
-
-                                }
-                        ]
-                },
-                "encryption": {
-                        "type": "string",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "encryption"
-                                                }
-                                        }
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "encryption"
-                                                }
-                                        }
-                                }
-                        ]    
-                },
-                "key": {
-                        "type": "string",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "key"
-                                                }
-                                        }
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "key"
-                                                }
-                                        }
-                                }
-                        ]
-                },
-                "enabled": {
-                        "type": "boolean",
-                        "version": "1.00",
-                        "read": true,
-                        "write": true,
-                        "protocols": [
-                                "cwmp",
-                                "usp"
-                        ],
-                        "mapping": [
-                                {
-                                        "rpc": "get",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "enabled"
-                                                }
-                                        }
-                                },
-                                {
-                                        "rpc": "set",
-                                        "type": "uci",
-                                        "uci": {
-                                                "file": "mapcontroller",
-                                                "section": {
-                                                        "name": "guest5"
-                                                },
-                                                "option": {
-                                                        "name": "enabled"
-                                                }
-                                        }
-                                }
-                        ]
-                }
-
-        }
-}
diff --git a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_voip.json b/sulu/sulu-vendorext/extn/X_GENEXIS_EU_voip.json
deleted file mode 100644
index 31c2be6f7..000000000
--- a/sulu/sulu-vendorext/extn/X_GENEXIS_EU_voip.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "Device.DeviceInfo.X_GENEXIS_EU.voip.": {
-        "type": "object",
-        "version": "1.00",
-        "protocols": [
-            "cwmp",
-            "usp"
-        ],
-        "access": false,
-        "array": false,
-        "reset": {
-            "type": "string",
-            "version": "1.00",
-            "read": false,
-            "write": true,
-            "protocols": [
-                "cwmp",
-                "usp"
-            ],
-            "mapping": [
-                {
-                    "rpc": "set",
-                    "type": "ubus",
-                    "ubus": {
-                        "object": "voip",
-                        "method": "reset",
-                        "args": {
-                            "sip": "@Value"
-			}
-		    }
-		}
-	    ]
-	},
-	"reset()": {
-		"type": "command",
-		"async": true,
-		"protocols": [
-			"usp"
-		],
-		"input": {
-			"sip": {
-				"type": "string",
-				"read": "true",
-				"write": "true",
-				"protocols": [
-					"usp"
-				]
-			}
-		},
-		"output": {
-			"result": {
-				"type": "string",
-				"read": "true",
-				"write": "false",
-				"protocols": [
-					"usp"
-				]
-			}
-		},
-		"mapping": [
-			{
-				"type": "ubus",
-				"ubus": {
-					"object": "voip",
-					"method": "reset",
-					"args": {
-						"sip": "@Input.sip"
-					}
-				}
-			}
-		]
-	}
-    }
-}
-