LOTS of cleanup to the Environment Accessor. Might need to do this before the ICG.