Remove some obsolete templates

Change-Id: I298bd67615b661a4237147c9773d187797827319
Merge "Remove some obsolete templates"