More clean up and nuspec