Removing references to mock