remove dependency-injected static state