OK, this is really the fianl cleanup. For real.
Big revert to work on other stuff.