HIVE-7624: clean up