Validator cleanup - alias