Add uninstall registry entries, cleanup