Switch back to clearing individual collections
Merge remote-tracking branch 'origin/master' into fix-clean
Merge pull request #42 from ozten/fix-clean

Fix clean