Cleanup CLI commands