Changing to object manager
Cleanup unused files