HIVE-7624: cleanup