HIVE-7334: clean up