More cleanup for the templates