Update the controller and remove jsonp functionalities