more simplification in prep for nuget