Code Cleanup Before Giant Rewrite Thing.