Pre-refactoring cleanup.