Remove support for files and collections