Merge pull request #2615 from pq/analyze_cleanup

Analyze command cleanup.