diff --git a/src/server.js b/src/server.js
index 1e2bc15..8e050fa 100644
--- a/src/server.js
+++ b/src/server.js
@@ -12,9 +12,9 @@ const ERR_NICKNAMEINUSE = '433'
 const ERR_NEEDMOREPARAMS = '461'
 
 let server = {}
-let registeredUserlist = require("../src/userlist.js")
 
 server.create = function create() {
+    let userlist = {}
     let server = net.createServer((socket) => {
         const user = new User(socket)
         socket.on('data', function (data) {
@@ -30,10 +30,10 @@ server.create = function create() {
                     if (tokenized[1]) {
                         let nickname = tokenized[1]
                         // nick collision test
-                        if (!Object.keys(registeredUserlist).includes(nickname)) {
+                        if (!Object.keys(userlist).includes(nickname)) {
                             user.setNickname(nickname)
-                            registeredUserlist[nickname] = user
                             socket.write(RPL_WELCOME, " nick " + nickname + " succesfully added.")
+                            userlist[user.nickname] = user
                         } else {
                             socket.write(ERR_NICKNAMEINUSE, " nickname in use")
                         }
@@ -56,7 +56,7 @@ server.create = function create() {
     });
 
     server.getUserlist = function() {
-      return registeredUserlist
+      return userlist
     }
 
     return server
diff --git a/src/userlist.js b/src/userlist.js
deleted file mode 100644
index 88cea11..0000000
--- a/src/userlist.js
+++ /dev/null
@@ -1,3 +0,0 @@
-let userlist = {}
-
-module.exports = userlist