cleanup debug a bit, probably tons that was missed