Base controller clean up.