remove collections maps, remove need to add collection as argument

See merge request !4