remove dependency on connect