Removed scaffold functions, scraping working