CLI, SENTY, cleanups