Update NuGet packages

* Also clean up unused code stuff