Remove more reference to Helpers.