Remove debugging.
Some cleanup.