Clean up in VS2013