Removing some unused references to the old Templates system
Some more removal of references to the old templates file.