scraper cleaned up