Scraper cleanup