Remove spurious debug stuff
Remove the rest