Clean-up validation logic