Fixing objects
Removed files that are handled in templates