removed some unwanted references in templates