clean-up after refactoring