Terminate better.
Some cleanup.