Cleaning up validation.