diff --git a/dist/config/index.js b/dist/config/index.js
deleted file mode 100644
index b95d622..0000000
--- a/dist/config/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const defaultConfig = {
-    port: 9000,
-    expire_timeout: 5000,
-    alive_timeout: 60000,
-    key: "peerjs",
-    path: "/myapp",
-    concurrent_limit: 5000,
-    allow_discovery: false,
-    proxied: false,
-    cleanup_out_msgs: 1000,
-    ssl: {
-        key: "",
-        cert: ""
-    }
-};
-exports.default = defaultConfig;
diff --git a/dist/src/api/v1/public/index.js b/dist/src/api/v1/public/index.js
index 1bf69f9..5931f04 100644
--- a/dist/src/api/v1/public/index.js
+++ b/dist/src/api/v1/public/index.js
@@ -9,7 +9,7 @@ exports.default = ({ config, realm }) => {
     // Retrieve guaranteed random ID.
     app.get("/id", (_, res) => {
         res.contentType("html");
-        res.send(realm.generateClientId());
+        res.send(realm.generateClientId(config.generateClientId));
     });
     // Get a list of all peers for a key, enabled by the `allowDiscovery` flag.
     app.get("/peers", (_, res) => {
diff --git a/dist/src/messageHandler/messageHandlers.js b/dist/src/messageHandler/messageHandlers.js
deleted file mode 100644
index 01b1e06..0000000
--- a/dist/src/messageHandler/messageHandlers.js
+++ /dev/null
@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class MessageHandlers {
-    constructor() {
-        this.handlers = new Map();
-    }
-    registerHandler(messageType, handler) {
-        if (this.handlers.has(messageType))
-            return;
-        this.handlers.set(messageType, handler);
-    }
-    handle(client, message) {
-        const { type } = message;
-        const handler = this.handlers.get(type);
-        if (!handler)
-            return false;
-        return handler(client, message);
-    }
-}
-exports.MessageHandlers = MessageHandlers;
diff --git a/dist/src/models/realm.js b/dist/src/models/realm.js
index 53fc672..743b184 100644
--- a/dist/src/models/realm.js
+++ b/dist/src/models/realm.js
@@ -41,10 +41,11 @@ class Realm {
     clearMessageQueue(id) {
         this.messageQueues.delete(id);
     }
-    generateClientId() {
-        let clientId = v4_1.default();
+    generateClientId(generateClientId) {
+        const generateId = generateClientId ? generateClientId : v4_1.default;
+        let clientId = generateId();
         while (this.getClientById(clientId)) {
-            clientId = v4_1.default();
+            clientId = generateId();
         }
         return clientId;
     }
diff --git a/package-lock.json b/package-lock.json
index 84cc9c2..1c7a4dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "peer",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6965337..d94ed82 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peer",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "PeerJS server component",
   "main": "dist/src/index.js",
   "bin": {