(Clone Detection) commented out another memory hog
Merge branch 'clone-detection' into working