Another massive cleanup of legacy cruft...
Even more epic cleanup....