Validation cleanup.