Merge "sysui: small refactor and delete dead code"