Cleanup the collections package, removing unnecessary class
Merge branch 'master' into collections