Remove unnecessary helpers.