improved clean-up after installs