clean-up now works nomatter where the package is installed.