Cleaning Up After Shim Disconnected