more debug removal