over on the xda boards and AF boards there is a rom floating around called FLASHBACK it will take you all the way back to an unrooted 1.5...abd then just let it do the OTA for 2.1 ....at which point you will be unrooted.... I just used this method for 2 Eris that i am sending back