Remove leftovers from a past refactoring.