- Removed all Environment-related code
Merge remote-tracking branch 'upstream/master'