removed some more .NET 3.5 code bits