Some cleanup. Removed IEnvironment, not used.