Removing changes put in for tests.