Tidy up HttpFetcher