Remove extra debug messages, whitespace changes.