Cleaning up character controller