SystemUI: cleanup

Change-Id: I6e34b01f11c69cc80883f474c2d2653c82500f2b