TOOLS-269 remove traces of vestigial shim code