Removed shim, if not necessary