Clean up a bunch of unused code and options. Specifically:
[mmh] / DATE
1  3 January 2012