clean up cli.js; kadoh change for nstore persistence.