diff --git a/zenmap/zenmapCore/UmitDB.py b/zenmap/zenmapCore/UmitDB.py
index d33c9243b..567bfdf05 100644
--- a/zenmap/zenmapCore/UmitDB.py
+++ b/zenmap/zenmapCore/UmitDB.py
@@ -239,15 +239,15 @@ class Table(object):
         for k in kargs.keys():
             sql += k
             sql += ", "
-        else:
-            sql = sql[:][:-2]
-            sql += ") VALUES ("
+
+        sql = sql[:][:-2]
+        sql += ") VALUES ("
 
         for v in xrange(len(kargs.values())):
             sql += "?, "
-        else:
-            sql = sql[:][:-2]
-            sql += ")"
+
+        sql = sql[:][:-2]
+        sql += ")"
 
         sql %= self.table_name
 
@@ -306,9 +306,9 @@ class UmitDB(object):
             log.debug(">>> Removing results with scans_id %s" % sid)
             self.cursor.execute("DELETE FROM scans WHERE scans_id = ?",
                     (sid, ))
-        else:
-            connection.commit()
-            log.debug(">>> Data base successfully cleaned up!")
+
+        connection.commit()
+        log.debug(">>> Data base successfully cleaned up!")
 
 
 class Scans(Table, object):
diff --git a/zenmap/zenmapGUI/MainWindow.py b/zenmap/zenmapGUI/MainWindow.py
index 7b2802126..aeddc0a1f 100644
--- a/zenmap/zenmapGUI/MainWindow.py
+++ b/zenmap/zenmapGUI/MainWindow.py
@@ -501,8 +501,8 @@ class ScanWindow(UmitScanWindow):
                         xml.sax.saxutils.quoteattr(scan))
 
                 self.main_actions.append(new_rscan)
-        else:
-            new_rscan_xml += "<separator />\n"
+
+        new_rscan_xml += "<separator />\n"
 
         self.default_ui %= new_rscan_xml