Minor tweak to templates to remove old cruft