Remove lingering templateData