Remove use of static instance inside formerly static template methods