CLI: Remove duplicated code paths

Nice catch