more cleanup since we inherit from qcom-common

Change-Id: I0138f9dcaa0fd6e54b7fc72c79151745e30a2cb7