Start on lots of cleanups.