These `|safe` calls aren't necessary anymore. remove please