NuGet package definition cleanups