More thorough clean-up in install scripts