Why not download and use the UBB move kit and then you can remove all of the UBB files.