Removed unused local var
Merge branch 'feature_env' into feature_merge