post-refactoring cleanup