Typos fixed in templates, remove old vars