HIVE-7431: clean up code
HIVE-7431: remove redundant code