SystemUI: Fix Build

Clean up the code too