Remove leftovers from the latest validator refactor.