Merge "sysui: remove some dead code"