HIVE-9153: clean up