Completely removed xhtml functionality (see #611)