Removing code added just for tests