Removing template changes