SystemUI: code cleanup