Remove calls to setup-client that are now handled in the with-client macro