Remove unused code path - simplifies other refactoring.