cleanup create_match