Removed references to ExtraInformationFetcher