JAL-2113 EBIFetchClient refactor / unit tests / remove unused fields and