Cleanup in CLI