Remove deprecated escapes
Fix ? for escapes