Cleaning up circular NuGet dependency