More CLI cleaning.