Change templates remove var modifiers