More cleanup.
8 files changed