Clean up

Remove unused dimens

Change-Id: I711790705e949323aaa5331d33f7bbaaa53ac289
Clean up part 2

check for radio before drawing carrier label

Change-Id: I461332b8daefd3d343058f2aa60ceebe662ab86c