Remove the controller
Improve the Connection