more qcom cleanup