Cleanup leftover from refactoring