More debug removal