cleaning up in the controllers