Consider also Easycleaner from Toniarts (free)
http://personal.inet.fi/business/toniarts/ecleane.htm
It produces an undo file.
I've been using this program through 3 versions of Windows over many
years with no problems.

EasyCleaner used to be free, but the last time I looked it had turned
commercial (you needed to pay a one-off fee, but could then download
anything from the site).

It _was_ a good program, but I found some parts were not 100% stable.