should/mocha update & commander cleaning