Clean up validation warning for validate