removed #__ variables from templates