In my experience it's easier (and sometimes no more time consuming) to do a full reinstall than to do a cleanup of a failing install. Maybe doing this sort of thing as a job soured me on any fun aspect of it. :)