Ele Generation clean up and event based not operator.