Static classes look cool, but let's go with dependency injection
instead…
Update a few missed static method calls