cleanup; update CMD