[!!!][TASK] Remove deprecated code from TemplateService