adds mocks, removes other stuff