Optimize cleaner run time#6815

danielblando merged 3 commits intocortexproject:mastercortexproject/cortex:masterfrom

alexqyle:cleaner-optimizationalexqyle/cortex:cleaner-optimizationCopy head branch name to clipboard