diff --git a/connection.py b/connection.py
index ea06b90..9232f02 100644
--- a/connection.py
+++ b/connection.py
@@ -40,7 +40,6 @@ def rdp_connect(address, user="", domain="", password="", dualmon=False):
         cmdline.extend(["/multimon"])
 
     cmdline.extend(["/v:%s" %(address)])
-    #cmdline.append(address)
 
     proc = subprocess.Popen(cmdline)
     print  cmdline
@@ -53,9 +52,4 @@ def rdp_connect(address, user="", domain="", password="", dualmon=False):
         logging.error("Process had died too quickly, rc=%d", rc)
         raise ConnectionFailedError()
     
-    #straceline = "strace -tt -f -p {0} &> {1}".format(proc.pid, "{0}/{1}".format(folder, datestring))
-    
-    #logging.debug(straceline)
-    #os.system(straceline)
-
     return proc.pid
diff --git a/rdc_ui.py b/rdc_ui.py
index 3a030fa..36ea740 100644
--- a/rdc_ui.py
+++ b/rdc_ui.py
@@ -150,10 +150,8 @@ def create_buttons(self):
         buttons["save"] = gtk.Button(u"← _Save")
         buttons["edit"] = gtk.Button(u"→ _Edit")
         buttons["new"] = gtk.Button(stock=gtk.STOCK_NEW)
-        buttons["delete"] = gtk.Button(stock=gtk.STOCK_DELETE)
-        #Exit Button patch for sound        
+        buttons["delete"] = gtk.Button(stock=gtk.STOCK_DELETE)   
         buttons["exit"] = gtk.Button(u"Exit")
-
         return buttons
 
 
@@ -183,7 +181,7 @@ def create_containers(self):
 
         # rightpane
         containers["rightpane"] = gtk.HBox(False, 10)
-        containers["main_box"].pack2(containers["rightpane"], resize=False, shrink=True)
+       containers["main_box"].pack2(containers["rightpane"], resize=False, shrink=True)
 
         # rightpane_align
         containers["rightpane_align"] = gtk.Alignment()
@@ -225,7 +223,6 @@ def create_buttonbox(self):
         buttonbox.add(self.buttons["save"])
         buttonbox.add(self.buttons["new"])
         buttonbox.add(self.buttons["delete"])
-#Exit button 
         buttonbox.add(self.buttons["exit"])
         return buttonbox
 
@@ -323,7 +320,6 @@ def create_treeview(self, liststore):
         for field in model.ENTRY_FIELDS:
             desc = model.FIELD_DESCRIPTION[field]
             cells.append(gtk.CellRendererText())
-#            cells[count].connect('edited', self.cell_edited, (liststore, count))
             treeview_columns.append(gtk.TreeViewColumn(desc, cells[count], text=count))
             treeview_columns[count].set_resizable(True)
             treeview_columns[count].set_sort_indicator(True)
diff --git a/settings.py b/settings.py
index bf5c94a..a3b9e7d 100644
--- a/settings.py
+++ b/settings.py
@@ -19,7 +19,6 @@
 RDP_PORT = 3389
 CONNECTION_TEST_TIMEOUT = 2 # Seconds of timeout when testing if target is accessible. Can also be a fraction
 
-# XFreeRDP (Geva edit: XFREERDP_STATIC_PARAMS also contained "--sec" + "rdp", had to remove to support dualmon)
 # example:  xfreerdp -a 32 -o --gdi sw --composition --sec rdp
 # example dualmon:  xfreerdp /multimon /f /u:user /p:password /v:servername
 XFREERDP_BIN = "xfreerdp"