controller clean up