Remove obsolete helpers.