remove cli stuff
support thunk style calling