diff --git a/dbfp.py b/dbfp.py
index 7849b1c..2298fb6 100644
--- a/dbfp.py
+++ b/dbfp.py
@@ -83,14 +83,12 @@ def androidData(data_dir):
     return
 
   for ddir in dirs:
-    #logging.info("ddir=={}".format(ddir))
     fq_dir = data_dir + os.path.sep + ddir
     __createFingerprint(fq_dir, ddir)
 
 # in_dir:  fully qualified directory path to find sqlite files
 def __createFingerprint(fq_dir, dir_name):
   try:
-    #cdir = BASE_DIR + os.path.sep + dir_name + os.path.sep + "databases"
     db_dir = fq_dir + os.path.sep + "databases"
     logging.info("fq_dir=={}".format(db_dir))
     files = os.listdir(db_dir)
@@ -98,21 +96,15 @@ def __createFingerprint(fq_dir, dir_name):
     # not finding a databases folder is normal, not all apps use sqlite
     return
   db = fingerprint.FingerprintDB()
-  fdir = FP_BASE_DIR + os.path.sep + dir_name
-  if (not mkdir(fdir)):
-    logging.error('Error creating directory "{}"'.format(fdir))
-    return
   for filein in files:
     ddir = db_dir + os.path.sep + filein
     logging.info('Parsing file "{}"'.format(ddir))
     retVal = db.scanDBFile(ddir)
     if (retVal > 0):
       fname = dir_name + "__" + filein + "__dbfp" + ".json"
-      fdir_name = fdir + os.path.sep + fname
-      #fh = open(fdir_name, "w")
+      fq_name = FP_BASE_DIR + os.path.sep + fname
       db.setAppName(dir_name)
-      db.writeFingerprintFile(fdir_name)
-      #fh.close()
+      db.writeFingerprintFile(fq_name)
 
 #
 def __getFileName():