frameworks & SystemUI: Cleanup code