code cleanup

Now only for ECP 3.x