remove nasty hard coding of unescaping