Remove use of mocks since we can use functions on their own now
Remove unused mocks