diff --git a/Server/copter_table_models.py b/Server/copter_table_models.py
index 1f5c142..9b85d6b 100644
--- a/Server/copter_table_models.py
+++ b/Server/copter_table_models.py
@@ -202,11 +202,12 @@ class CopterDataModel(QtCore.QAbstractTableModel):
         if role == Qt.CheckStateRole:
             self.data_contents[row].states.checked = value
         elif role == Qt.EditRole:  # For user actions with data
-            if col == 0 and self.on_id_changed:
-                self.data_contents[row][col] = "Awaiting for response"
-                self.data_contents[row].states.copter_id = None
+            if col == 0: # and self.on_id_changed:
+                #self.data_contents[row][col] = "Awaiting for response"
+                #self.data_contents[row].states.copter_id = None
 
                 self.data_contents[row].client.send_message("id", {"new_id": value})
+                self.data_contents[row].client.remove()
             else:
                 self.data_contents[row][col] = value
 
diff --git a/Server/server.py b/Server/server.py
index 8df4faf..311b924 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -142,7 +142,7 @@ class Server(messaging.Singleton):
 
         while self.client_processor_thread_running.is_set():
             events = self.sel.select()
-            logging.error('tick')
+            #logging.error('tick')
             for key, mask in events:
                 # logging.error(mask)
                 # logging.error(str(key.data))
diff --git a/Server/server_qt.py b/Server/server_qt.py
index 77d4e90..76343a7 100644
--- a/Server/server_qt.py
+++ b/Server/server_qt.py
@@ -74,7 +74,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show()
         
     def init_model(self):
-        self.model.on_id_changed = self.set_copter_id
+        # self.model.on_id_changed = self.set_copter_id
 
         self.proxy_model.setDynamicSortFilter(True)
         self.proxy_model.setSourceModel(self.model)
@@ -210,16 +210,18 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.signals.update_data_signal.emit(row, col, data, ModelDataRole)
 
-    def set_copter_id(self, value, copter_data_row):
-        col = 0
-        row = self.model.get_row_index(copter_data_row)
-        if row is None:
-            logging.error("No such client!")
-            return
 
-        copter_data_row.client.copter_id = value
-        self.signals.update_data_signal.emit(row, col, value, ModelDataRole)
-        self.signals.update_data_signal.emit(row, col, True, ModelStateRole)
+    #def set_copter_id(self, value, copter_data_row):
+    #    col = 0
+    #    row = self.model.get_row_index(copter_data_row)
+    #    if row is None:
+    #        logging.error("No such client!")
+    #        return
+    #    logging.info("SET COPTER ID TO {}".format(value))
+    #
+    #    copter_data_row.client.copter_id = value
+    #    self.signals.update_data_signal.emit(row, col, value, ModelDataRole)
+    #    self.signals.update_data_signal.emit(row, col, True, ModelStateRole)
 
     @pyqtSlot(QtCore.QModelIndex)
     def selfcheck_info_dialog(self, index):