Can probably remove this chunk of code since we're not mocking this stuff anymore