Unused helpers removed.