Removed xhtml templates