Remove dependancy on .NET Framework 3.5