Reverted most parts to old version

Last version are not stable. Long delays are needed. Keept parts
specific to EFCOM and MEGA