Validation cleanup