Cleanup old scraper code, update new settings