Cleanup in fetcher