HIVE-7334: code clean up