Cleanup.
Rewrote driver program.