Cleanup leftovers that VS2013 missed