Remove unneeded span