I've been working on removing these from State, and just passing them in when needed. I can handle this change when I merge.