Remove remaining uses of systemu