Clean up code and pages and functionality