Small cleaning of mocks