Strip out duplicate code

Part of the cleanup after a failed refactoring attempt.