Fixup - remove analytics from template