Switch to VS 2013 and .NET 4.5.1
Clean up code