Some more cleanups
12 files changed