Remove unnecessary <span>