Mass cleanup.

Dropped a lot of stuff like the scraping.  Going for a separation of concerns.