Extra cleanup after refactor