Merge "Split out quickCleanDir() function just for thumbnails for consistency."