Cleaning up after refactoring.