HIVE-8852: clean up