Remove no-longer used template
Merge pull request #3801 from ussuri/small-fixes-4

Remove no-longer used template