Cleanup in RestorePackageHelper