SystemUI:: Code cleanup