compatibility with hive 13 -- remove refs to dead shims