removed conditional code that relied on NET35 compilation symbol
merged with version-2