More cleaning up.
27 files changed