Tweak installation
Cleanup afterwards