HIVE-7540: remove unnecessary code