Scraper overhaul