Cleanup. Removed support for 4-column output.