Removing now-unneeded static mocking