Removed NuGet.Core references and simplified for CLI ops