More Cleanup for VS2013U2 and CM2