Unplug 1.6 -- minor fix, remove invalid xhtml messages for example 1.