Remove unnecessary span