More nuget cleanup