Removing a bunch of unused stuff from the env package