clean up validation