Commented unused templates, that caused errors