remove targets to get nuget package to work, plus minor cleanup