Remove master mock, not needed currently