environments are messed up, first try at cleaning up.