Removed artefact watchlist related code, and a couple of methods that don't look like they're ever used