Proposal to remove deprecated shim-layer implementation