Remove dead code
Refactor collection spec
Remove dead code