cleaning up controllers and pages