more removal of commented debug statements