cherry-picked cli removal commits

note run.js has some modifications that we'll want to also cherry-pick or copy over later. this pr is the result of this cherry-pick onto `next`, with conflict cleanup

    git cherry-pick cea8d3db5b137a3f69b2a87766b587b19e364a01 -m 1