diff --git a/src/core/nick-rec.h b/src/core/nick-rec.h
index 7dff6f32..d0dbce3d 100644
--- a/src/core/nick-rec.h
+++ b/src/core/nick-rec.h
@@ -20,7 +20,7 @@ unsigned int op:1;
 unsigned int halfop:1;
 unsigned int voice:1;
 
-GHashTable *module_data;
+/*GHashTable *module_data;*/
 
 void *unique_id; /* unique ID to use for comparing if one nick is in another channels,
 		    or NULL = nicks are unique, just keep comparing them. */
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 66b58ffb..01e590fa 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -76,7 +76,7 @@ static void nick_hash_remove(CHANNEL_REC *channel, NICK_REC *nick)
 /* Add new nick to list */
 void nicklist_insert(CHANNEL_REC *channel, NICK_REC *nick)
 {
-	MODULE_DATA_INIT(nick);
+	/*MODULE_DATA_INIT(nick);*/
 
 	nick->type = module_get_uniq_id("NICK", 0);
         nick->chat_type = channel->chat_type;
@@ -102,7 +102,7 @@ static void nicklist_destroy(CHANNEL_REC *channel, NICK_REC *nick)
 {
 	signal_emit("nicklist remove", 2, channel, nick);
 
-        MODULE_DATA_DEINIT(nick);
+        /*MODULE_DATA_DEINIT(nick);*/
 	g_free(nick->nick);
 	g_free_not_null(nick->realname);
 	g_free_not_null(nick->host);