remove dependency-injected static state

**please review**
Just yesterday I made this change but hesitated to send a pull request ...