Remove modifications so unit tests pass