Revert "first set of ECA"

This reverts commit 950837c109401077345cfc463467f16892e15f50.