removed conduit dependency and related code