m7gsm: cleanup

Change-Id: I65ce14624d33aace10a7dade077d677ac528f902