Some descriptions and comments are not accurate after removing a banch of CLI commands. Clean up after all removals are done. Also check the unused variables/functions.