Remove refactoring remnant