removed some unnecessary methods in controller