Separate out uninstall and upgrade methods