Cleanup after refactor