Removing template cruft