Clean up the environment

We should do that.