Got rid of environment references.
Whoops