Remove yahoo specific stuff