removed circular adaptor includes