Remove debug output.
Minor changes.