removing duff fns
adding cheerio