Major cleanup.
209 files changed