Removed template cruft