Before I knew anything I jumped in and deleted some bloatware with Titanium Backup. I found the apk's at the chadhanley link that Abe provided for you. I installed the apk's through Root Explorer and fixed permissions just as explained in the directions I found. The 2.2 OTA still would not go through.
I didn't do an SBF I called warranty and they sent a new one. But what I know now, an SBF would have been easier. Plus you gotta watch what you say to warranty. So I would read up on an SBF. Make sure it is for your 2.1 version.