Templates: Remove cruft