SystemUI: clean up

Change-Id: Ifca8cc6a1c826b7884ab4e627e8a9bfe8d7a14fb
cleanup

Change-Id: Ia282dcba245312e9af9ce02e44b963e3f0cbef22