OK, probably a separate commit/PR then
@LaurentGoderre can we just delete this fully now?