Remove the use of the raw helper in all places