Validator and clean up