Cleaning out CommandLine for Caliph