Clean up references
Switch to .NET 4