Removing references to Environment from BdbEnvironmentStats and aggregate stats