remove dependency-injected static state

**do not review yet**