SystemUI: cleanup

Change-Id: I44e546628eb82dab635928dc76113dd192cc322a