Cleanup after refactoring