Removed obsolete template references