Finally, replace legacy Util/Filter with Validator.