Remove unesscarary span elements