remove static state for Tool.instance
Merge pull request #1087 from dwightguth/staticstatetool

remove static state for Tool.instance