remove cli stuff
support thunk style calling
remove dependencies no longer needed