Removed internal implementations from mock code

These were transitively bringing in other library code