Remove unnecessary helpers