Remove pointless span