Type enum in Collection.h to make domme happy :)
Remove unused code.