Cleaning up the remains of the old CLI code ...
Cleaning up the remains of the old CLI code ...