HIVE-9153: cleanup