Cleanup2

As discussed this week, here's the 2nd round of cleanups.