Clean up validator type