HIVE-7527: clean up