removed circular adaptor calls