clean up controller and model