Remove unused shim