More nuget tidying