[TASK] Cleanup in Provider->getTemplateVariables