Cleanup by using shim