Removed settings view controller and cleaned up other things