Got rid of environment references.