cleanup after refactoring