HIVE-8972: clean up