Removed temporary templates

Change-Id: Ibb3893b8133318f20698d3edddcb394cfdb33ad2