Remove lingering templateData
Merge pull request #9707 from mmun/remove-templateData

Remove lingering templateData