Killed a bunch of old cruft.
Added a few new aliases. Minor cleanup.