Validation clean-up.