remove qcom dependencies pt.2