diff --git a/src/core/cntlr.c b/src/core/cntlr.c
index 65035dd19cc941edc3ecd346e09585cc59b7cae7..e79859c65fcbdee252718acf6060e9ca93349980 100644
--- a/src/core/cntlr.c
+++ b/src/core/cntlr.c
@@ -2150,15 +2150,6 @@ static int mapclient_subscribe(struct controller *a, uint32_t oid)
 	return 0;
 }
 
-typedef uint32_t mapmodule_object_t;
-
-struct map_module_unish {
-	mapmodule_object_t id;
-	uint32_t cmdu_mask;
-	char process_cmdu_funcname[64];
-};
-
-
 static void register_cb(struct ubus_request *req, int type, struct blob_attr *msg)
 {
 	struct controller *priv = (struct controller *)req->priv;
@@ -2178,10 +2169,6 @@ static void register_cb(struct ubus_request *req, int type, struct blob_attr *ms
 	}
 }
 
-#ifndef BITx
-#define BITx(n)	(1U << (n))
-#endif
-
 static void mapclient_subscribe_for_cmdus(struct controller *c)
 {
 	char data[2 * sizeof(struct map_module) + 1] = {0};
@@ -2193,7 +2180,6 @@ static void mapclient_subscribe_for_cmdus(struct controller *c)
 		.process_cmdu_funcname = "mapclient_process_cmdu",
 	};
 
-
 	map_prepare_cmdu_mask(m.cmdu_mask,
 			CMDU_TYPE_TOPOLOGY_DISCOVERY,
 			CMDU_TYPE_TOPOLOGY_NOTIFICATION,
@@ -2205,7 +2191,6 @@ static void mapclient_subscribe_for_cmdus(struct controller *c)
 			CMDU_TYPE_AP_AUTOCONFIGURATION_WSC,
 			-1);
 
-
 	trace("<----------------------------------- %s\n", __func__);
 
 	for (;;) {