reannimated

Okay i watched mejdam video on how to unroot or "downgrade", but that method isn't working for me and i even repartitioned my sd card to fat32 just incase but when i booted in hboot it said missing file. so im wondering if there is another way to unroot my phone so i can get the 2.2 update. I'm currently running Clockwork 2.5.0.1 Android 2.1-update 1 Kernel 2.6.29-cclc2268 Software number 1.22.605.2 and i also rooted with unrevoked 3 and i dual boot on my so os isn't a problem

and will the stock ruu remove superuser and allow me to get the 2.2 update when it comes out