Remove escape calls