HIVE-7334: coed clean up