Tiny cleanup / SIM hotswap

The SIM card one is pretty annoying though.  Yesterday, I received a dialog box that said my sim card had been removed and forced a reboot.  I assume that this commit would have saved me from having to reboot my phone (but I don't know for sure because it hasn't happened since...).