Preparing for E.F.A. 3.0.0.4 and cleanup in EFA-Update