Add QCOM CNE support, and more cleanup