Drop usage of validatiors.EMPTY_VALUES