Removed old collections, no longer used
Fixed indentation for clean build

Can haz continuous integration?