Eng 5730 ee cleanup

Waiting for Jenkins...

Code clean up without nested loop index executor, because potential lots of conflict with Mike. The final goal is to get rid of the coupled index executor code.