made scraper more robust and extensible
removed old scraper