CLI: Remove duplicated code paths