Improve remove dipole
Add EB corrections