Okay, so my warranty is ending in 6 days and so I was hoping to do a quick exchange before it ended. I have a few of those screen bubbles other people have talked about on here (along with a little screen discoloration) and it'd be nice to get that taken care of.

Well, I've been one of those people who has jailbroken/pwned/etc since pretty much day one, so I want to make sure I have it back to the factory settings before I make the exchange.

I just restored my iPhone back to the factory settings/original 1.1.4 firmware, but it kept my custom carrier text changed from when I used MakeItMine. What is the easiest way to change it back to the default "AT&T"?

Are there any other things I should check on or do before I take it to the Apple Store?