Break out ControllerUpdate and Remove into seperate commands