Remove no longer needed stubs from unit tests