More cleanup.
Refactor.
Cleanup.
More cleanup and code removal.