cleanup since using qcom-common