Remove the rest of the old Scraper