Kill unnecessary template variables

Change-Id: Ia249491cc649e9bd6018df9beaa10d467f2f7a1a