Remove: command line functionality and commander dependency