Revert "More cleanup."

This reverts commit e33f5d36830b8ce3b790dc032d6e1cf6e840bd6e.
Good cleanups.