Remove superfluous helpers.