Cleaned up activities controller, removed cloning