Fetcher cleanup