removing dead code
removed useless variable
Merge remote-tracking branch 'origin/env_fault'
v1.6.5