diff --git a/server.js b/server.js
index 39385d0..ad2ec6d 100644
--- a/server.js
+++ b/server.js
@@ -18,14 +18,15 @@ console.log("ENTER THE SOCKET");
 
 const io = new Server(server, {
   cors: {
-    origin: ['http://localhost:3000',
-             'http://localhost:5001',
+    origin: [
+            'http://localhost:3000',
+            'http://localhost:5001',
             'http://localhost:9080/',
             'http://localhost:8090/',
             'https://works.mermsemr.com/',
             'http://work.mermsemr.com/',
             'https://users.mermsemr.com/',
-            'http://socket-dev.mermsemr.com',
+            'http://dev-socket.mermsemr.com',
             'https://socket-dev.mermsemr.com',
             'https://socket.mermsemr.com',
              '*','*:*'],
@@ -36,55 +37,26 @@ const io = new Server(server, {
 //io.origins('*:*') // for latest version
 
 io.on("connection", (socket) => {
-  console.log(`User Connected: ${socket.id}`);
+    console.log(`User Connected: ${socket.id}`);
 
-  socket.on("join_room", (data) => {
+    socket.on("join_room", (data) => {
     socket.join(data);
     console.log(data);
-  });
+    });
 
-  socket.on("send_message", (data) => {
-      // console.log("send_message", data.room);
-      console.log("START ************************send_message");
-      console.log("send_message ", data.room);
-      console.log("send_message DATA ", data);
-      console.log("END   ************************send_message");
+    socket.on("send_message", (data) => {
+    // console.log("send_message", data.room);
+    console.log("START ************************send_message");
+    console.log("send_message ", data.room);
+    console.log("send_message DATA ", data);
+    console.log("END   ************************send_message");
     socket.to(data.room).emit("receive_message", data);
-  });
-
-  // to be removed 
-  socket.on("marketjob", (data) => {
-    console.log("marketjob", data.room);
-   socket.to(data.room).emit("marketjob_actions", data);
-  });
-
-  socket.on("marketjob_added", (data) => {
-    console.log("START ************************marketjob_added");
-    console.log("marketjob_added ", data.room);
-    console.log("marketjob_added DATA ", data);
-    console.log("END   ************************marketjob_added");
-
-      Qstring =   "SELECT * FROM members_jobs_contract  ORDER BY id desc LIMIT 20";
-      //"  SELECT id,uid,job_uid,originalname FROM from members_jobs_files WHERE job_uid= '"+ data.job_uid +"'";
-      db.query(Qstring, function (err, result) {
-          try {
-              if (err) throw err;
-              socket.to(data.room).emit("received_refreshmarket_jobs",  result.rows);
-          } catch (e) {
-              socket.to(data.room).emit("received_refreshmarket_jobs", data);
-          }
-      });
-   });
-
-    socket.on("family", (data) => {
-        console.log("family", data.room);
-        socket.to(data.room).emit("family_actions", data);
     });
 
 });
 
 server.listen(port, () => {
-  console.log("SERVER IS RUNNING");
+  console.log(`SERVER IS RUNNING on ${port}`);
 });
 
 //https://github.com/lemoncode21/nodejs-kafka/blob/master/index.js
\ No newline at end of file