Cleaning up and rebuilding after refactor.