remove dependency-injected static state

**please review**
fixed. I took the easy path here when I was resolving a merge conflict, that is why.