Remove references to the controller