Cleaning up save env, working on restore env.