remove, shim not needed