remaining cleanup of helper references