core6 changes
deleting unused template