fix templates
Merge pull request #2830 from Shqrdx/TemplateFix

Removed unused using's from some templates