removing hard dependency on resolver cb