Cleanup templates

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch looks good to me. acked.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk/I+9IACgkQrlYvE4MpobMxAQCeIAoHqZLNEkf8t3Ux4aZoxq2Y Wv8AoLGT4uotIk7QtV4x4hbF8ejNAuhv
=dIrb
-----END PGP SIGNATURE-----