Remove debug stuff, change a comment