diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 21012964..3176fa90 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -202,7 +202,7 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
             nzbtomedia.remove_torrent(clientAgent, inputHash, inputID, inputName)
 
         # cleanup our processing folders of any misc unwanted files and empty directories
-        nzbtomedia.cleanProcDirs()
+        nzbtomedia.cleanDir(inputDirectory, sectionName, inputCategory)
 
     return result
 
diff --git a/nzbToMedia.py b/nzbToMedia.py
index a6213ea9..ba851806 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -282,7 +282,7 @@ from nzbtomedia.autoProcess.autoProcessGames import autoProcessGames
 from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie
 from nzbtomedia.autoProcess.autoProcessMusic import autoProcessMusic
 from nzbtomedia.autoProcess.autoProcessTV import autoProcessTV
-from nzbtomedia.nzbToMediaUtil import getDirs, extractFiles, cleanProcDirs, update_downloadInfoStatus, get_downloadInfo
+from nzbtomedia.nzbToMediaUtil import getDirs, extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo
 from nzbtomedia import logger, nzbToMediaDB
 
 # post-processing
@@ -351,7 +351,7 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down
             update_downloadInfoStatus(inputName, 1)
 
         # cleanup our processing folders of any misc unwanted files and empty directories
-        cleanProcDirs()
+        cleanDir(inputDirectory, sectionName, inputCategory)
 
     return result
 
diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py
index 884eb197..86eb5afd 100644
--- a/nzbtomedia/__init__.py
+++ b/nzbtomedia/__init__.py
@@ -30,7 +30,7 @@ from nzbtomedia import logger, versionCheck, nzbToMediaDB
 from nzbtomedia.nzbToMediaConfig import config
 from nzbtomedia.nzbToMediaUtil import category_search, sanitizeName, copy_link, parse_args, flatten, getDirs, \
     rmReadOnly,rmDir, pause_torrent, resume_torrent, remove_torrent, listMediaFiles, \
-    extractFiles, cleanProcDirs, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanProcDirs, \
+    extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanDir, \
     create_torrent_class, listMediaFiles
 from nzbtomedia.transcoder import transcoder
 from nzbtomedia.databases import mainDB
diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py
index e42da434..9258984d 100644
--- a/nzbtomedia/nzbToMediaUtil.py
+++ b/nzbtomedia/nzbToMediaUtil.py
@@ -456,26 +456,23 @@ def rmDir(dirName):
     except:
         logger.error("Unable to delete folder %s" % (dirName))
 
-def cleanProcDirs():
-    logger.info('Cleaning processing directories ...', 'CLEANDIRS')
-    for section, subsections in nzbtomedia.SECTIONS.items():
-        for subsection in subsections:
-            for dirName in nzbtomedia.getDirs(section,subsection):
-                try:
-                    minSize = int(nzbtomedia.CFG[section][subsection]['minSize'])
-                except:minSize = 0
-                try:
-                    delete_ignored = int(nzbtomedia.CFG[section][subsection]['delete_ignored'])
-                except:delete_ignored = 0
-                num_files = len(listMediaFiles(dirName, minSize=minSize, delete_ignored=delete_ignored))
-                if num_files > 0:
-                    logger.info(
-                        "Directory %s still contains %s unprocessed file(s), skipping ..." % (dirName, num_files),
-                        'CLEANDIRS')
-                    continue
+def cleanDir(path, section, subsection):
+    logger.info('Cleaning directory:%s ...' % (path), 'CLEANDIRS')
+    try:
+        minSize = int(nzbtomedia.CFG[section][subsection]['minSize'])
+    except:minSize = 0
+    try:
+        delete_ignored = int(nzbtomedia.CFG[section][subsection]['delete_ignored'])
+    except:delete_ignored = 0
 
-                logger.info("Directory %s has already been processed, removing ..." % (dirName), 'CLEANDIRS')
-                shutil.rmtree(dirName)
+    num_files = len(listMediaFiles(path, minSize=minSize, delete_ignored=delete_ignored))
+    if num_files > 0:
+        logger.info(
+            "Directory %s still contains %s unprocessed file(s), skipping ..." % (path, num_files),
+            'CLEANDIRS')
+
+    logger.info("Directory %s has already been processed, removing ..." % (path), 'CLEANDIRS')
+    shutil.rmtree(path)
 
 def create_torrent_class(clientAgent):
     # Hardlink solution for Torrents