Remove CXX from analysis