Installer tweak & clean