Move methods into the file that holds the collection description

I'm not sure this is a good idea
Remove obsolete file