Throw out all CLI code out of Run