HIVE-8017: clean up