remove dependency-injected static state

**please review**