Cleanup with faithful Vs2013