Some cleanup for new CLI commands Upstream-commit: 8258b09df18506b802745ea370b52b384f51ae18 Component: engine