And some more debug removal