I wouldn't upgrade to 2.2.1 as it's too buggy, but you can upgrade to 2.3.3 I don't know if they'll return after removing them (technically they shouldn't) but gingerbread IS rootable via a program called Gingerbreak so you can root it and remove the software again regardless