MT#8715 remove old template files too