Remove references to deprecated templates

[welteki]

Description

Remove remaining references to deprecated templates.

Motivation and Context

• I have raised an issue to propose this change (required)

How Has This Been Tested?

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I've read the CONTRIBUTION guide
• I have signed-off my commits with git commit -s

[alexellis]

This needs a rebase, I have covered some if not all of these changes at matter of general maintenance.