More cleanup to make the NuGet version good