Clean up validation logic