SystemUI: cleanup

Change-Id: I8ef6cf272a150f2d41da317c8ad4073395c1e666