Remove unused strings

Change-Id: I09a6ffd50b2730fa80252e5d4d836c8542f5031d
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1