More removed escaping