controller and model cleanup