Removed unused mocks

Code cleanup