fixes from bad merge conflicts
Cleanup of unused controllers and views (to be moved to UserProfiles)