more cleanup since we inherit from qcom-common