clean up rest of escapes from other hcommands