Updated cheerio version. Removed hacks. General cleanup.