Remove indirection on Connect