Remove ExpandTemplates

Change-Id: I1acc03845295c558dbb44ffc476bc83a2e8cfb54