Remove unnecessary shim