cleanup qcoms

Change-Id: I890778419cbf1a76aa139fa399d94f43feffe827