SystemUI: code cleanup for recent