1.6-ification

Removed markup, used shared sanetize_text, updated test