cleanup after refactor