More cleanups
5 files changed