Cleaning up validation calls