Clean up unused templates

Change-Id: I6f1fd6f0531892e08a0299d94cf353fdae1dba81