Removed several references, changed to .NET 3.5