Removed AdapterServiceFactory