Moved string sanitising in to core