cleaning up some controllers