VS 2013 Convert & Cleanup