Minor cleanups.
Deletion binge.

Retrenching so we can start the "real" organization.