Remove unecessary complexity in cli module