Clean Controllers and fix addition of Rescuer and puppies together