Templates cleanup

Change-Id: Ide4d21e0b81d3bb266339a9abf98b5640e99614c