Readded uninstall code