no-split for unite commands, cleanup