HIVE-7773: clean up