Revert "finetuning environment placement and cleaned up"

This reverts commit c60c675d90f0ae2f0a7543f0fd3334ac0a94369e.