Removed some strays in templates