HIVE-8610-trunk: remove unused code