Make deletion robust to errors.
Small startup tweaks.