removed passing setup and logger objects between client tools
removed in-place modification of "states" dict in client tools