Remove static controller and pages and also cleaned up json comments in new controllers