ui-utils desubmodulization