Templates cleanup

Change-Id: Ibdaa87a05e8125614feffb5763527648644ef794