Cleanup controller and not unnecessary code :beers: