Clean up command groups.