Add some missing templates from old-templates, remove some unused / errant templates.