Fixed escaping problems.
Removed accidentally-committed templates.