diff --git a/fill-repodb.py b/fill-repodb.py
index f25d008..ac357d5 100755
--- a/fill-repodb.py
+++ b/fill-repodb.py
@@ -85,8 +85,6 @@ CREATE TABLE obj_symbols_res(id INTEGER PRIMARY KEY NOT NULL,
 
 def index_database(conn):
     print 'Indexing the database...'
-#    conn.execute("""CREATE INDEX IF NOT EXISTS rd_rd_id ON repodir_depends(repodir_id)""")
-#    conn.execute("""CREATE INDEX IF NOT EXISTS rd_drd_id ON repodir_depends(depend_repodir_id)""")
     conn.execute('CREATE INDEX IF NOT EXISTS rd_name ON repodirs(name)')
     conn.execute('CREATE INDEX IF NOT EXISTS pkg_name ON packages(name)')
     conn.execute('CREATE INDEX IF NOT EXISTS pkg_arch ON packages(nvra)')
@@ -172,7 +170,6 @@ FILE_REC_LINK_IDX = 6
 FILE_REC_MARK_IDX = 7
 
 def register_object(data, pkg_id, pkg, object_file_record, temp_dir):
-#    print 'register_library ', obj_file_path
     so_needed = data['so_needed']
     obj_symbols = data['obj_symbols']
     obj_id = object_file_record[0]
@@ -190,8 +187,6 @@ def register_object(data, pkg_id, pkg, object_file_record, temp_dir):
                                    os.readlink(temp_obj_file))
         file_mark = 'link'
     elif not os.path.exists(temp_obj_file):
-    #        print 'File %s was not extracted from the package %s.' % \
-    #              (obj_file_path, pkg)
         file_mark = 'not-found'
     else:
         p = subprocess.Popen(['objdump', '-p', temp_obj_file],
@@ -304,7 +299,6 @@ def process_package_worker(num, queue_in, generator, gen_lock, db_struct, repodi
                 to_string(pkg, tag, hval) if type(hval) in [type([]), type('')] else \
                 hval
             )
-        # sorted(packages_extra_fields.keys())
         package_values.append(repodir_id)
         package_values.append(pkg)
         package_values.append(None)
@@ -382,7 +376,7 @@ def process_package_worker(num, queue_in, generator, gen_lock, db_struct, repodi
 
         queue_in.task_done()
 
-    conn = sqlite3.connect(DB, timeout=30) #, isolation_level='DEFERRED', timeout=30)
+    conn = sqlite3.connect(DB, timeout=30)
     conn.executemany("""
 INSERT INTO packages (%s)  VALUES (%s)""" %
                         (db_struct['packages_field_names'],
@@ -461,7 +455,7 @@ def process_repodir(repodir_path, repodir_id, build_archs, conn, db_struct, temp
             if re.match(file_tags_re, tag) or re.match(dir_tags_re, tag) or \
                 re.match(changelog_tags_re, tag) or  \
                 re.match(skip_tags_re, tag) or re.match(trigger_tags_re, tag) or \
-                re.match(dep_tags_re, tag): # and tag < 'RPMTAG_DIRINDEXES':
+                re.match(dep_tags_re, tag):
                 continue
             sqltype = "TIMESTAMP" if tag in datetime_tags else \
                         "BLOB" if tag in db_struct['blob_tags'] else \
@@ -540,7 +534,7 @@ def main(args):
     parser = ET.XMLParser()
     tree = ET.parse(options.config, parser=parser)
     config_root = tree.getroot()
-    tempdir = '/dev/shm/rt-tmp/' #tempfile.mkdtemp()
+    tempdir = '/dev/shm/rt-tmp/'
     shutil.rmtree(tempdir, True)
     os.mkdir(tempdir)
     rpm_db_struct = {}