Get rid of logging in controller