issue #23086: clean up data