diff --git a/src/hostkey.c b/src/hostkey.c
index e7585067..0f3c8b8e 100644
--- a/src/hostkey.c
+++ b/src/hostkey.c
@@ -79,7 +79,6 @@ hostkey_method_ssh_rsa_init(LIBSSH2_SESSION * session,
         return -1;
     }
 
-    buf.offset = 0;
     buf.data = (unsigned char *)hostkey_data;
     buf.dataptr = buf.data;
     buf.len = hostkey_data_len;
@@ -300,7 +299,6 @@ hostkey_method_ssh_dss_init(LIBSSH2_SESSION * session,
         return -1;
     }
 
-    buf.offset = 0;
     buf.data = (unsigned char *)hostkey_data;
     buf.dataptr = buf.data;
     buf.len = hostkey_data_len;
@@ -529,7 +527,6 @@ hostkey_method_ssh_ecdsa_init(LIBSSH2_SESSION * session,
         return -1;
     }
 
-    buf.offset = 0;
     buf.data = (unsigned char *)hostkey_data;
     buf.dataptr = buf.data;
     buf.len = hostkey_data_len;
@@ -667,7 +664,6 @@ hostkey_method_ssh_ecdsa_sig_verify(LIBSSH2_SESSION * session,
 
     /* keyname_len(4) + keyname(19){"ecdsa-sha2-nistp256"} +
        signature_len(4) */
-    buf.offset = 0;
     buf.data = (unsigned char *)sig;
     buf.dataptr = buf.data;
     buf.len = sig_len;
diff --git a/src/kex.c b/src/kex.c
index 2d21ba66..94de578e 100644
--- a/src/kex.c
+++ b/src/kex.c
@@ -1715,7 +1715,6 @@ kex_method_diffie_hellman_group_exchange_sha1_key_exchange
             goto dh_gex_clean_exit;
         }
 
-        buf.offset = 0;
         buf.data = key_state->data;
         buf.dataptr = buf.data;
         buf.len = key_state->data_len;
@@ -1843,7 +1842,6 @@ kex_method_diffie_hellman_group_exchange_sha256_key_exchange
             goto dh_gex_clean_exit;
         }
 
-        buf.offset = 0;
         buf.data = key_state->data;
         buf.dataptr = buf.data;
         buf.len = key_state->data_len;
@@ -2686,7 +2684,6 @@ curve25519_sha256(LIBSSH2_SESSION *session, unsigned char *data,
             goto clean_exit;
         }
 
-        buf.offset = 0;
         buf.data = data;
         buf.len = data_len;
         buf.dataptr = buf.data;
diff --git a/src/misc.c b/src/misc.c
index 32623519..1fb8780b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -742,7 +742,6 @@ int _libssh2_get_u32(struct string_buf *buf, uint32_t *out)
 
     *out = _libssh2_ntohu32(buf->dataptr);
     buf->dataptr += 4;
-    buf->offset += 4;
     return 0;
 }
 
@@ -754,7 +753,6 @@ int _libssh2_get_u64(struct string_buf *buf, libssh2_uint64_t *out)
 
     *out = _libssh2_ntohu64(buf->dataptr);
     buf->dataptr += 8;
-    buf->offset += 8;
     return 0;
 }
 
@@ -779,7 +777,6 @@ int _libssh2_get_c_string(struct string_buf *buf, unsigned char **outbuf)
     }
     *outbuf = buf->dataptr;
     buf->dataptr += data_len;
-    buf->offset += data_len;
     return data_len;
 }
 
@@ -808,7 +805,6 @@ int _libssh2_get_bignum_bytes(struct string_buf *buf, unsigned char **outbuf)
     *outbuf = bnptr;
 
     buf->dataptr += data_len;
-    buf->offset += data_len;
 
     return bn_len;
 }
diff --git a/src/misc.h b/src/misc.h
index 7bae4043..cd86b26f 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -1,6 +1,6 @@
 #ifndef __LIBSSH2_MISC_H
 #define __LIBSSH2_MISC_H
-/* Copyright (c) 2009-2014 by Daniel Stenberg
+/* Copyright (c) 2009-2019 by Daniel Stenberg
  *
  * All rights reserved.
  *
@@ -53,7 +53,6 @@ struct string_buf {
     unsigned char *data;
     unsigned char *dataptr;
     size_t len;
-    size_t offset;
 };
 
 int _libssh2_error_flags(LIBSSH2_SESSION* session, int errcode,
diff --git a/src/sftp.c b/src/sftp.c
index d535ba06..668bdd47 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -679,7 +679,6 @@ sftp_bin2attr(LIBSSH2_SFTP_ATTRIBUTES *attrs, const unsigned char *p,
     buf.data = (unsigned char *)p;
     buf.dataptr = buf.data;
     buf.len = data_len;
-    buf.offset = 0;
 
     if(_libssh2_get_u32(&buf, &flags) != 0) {
         return LIBSSH2_ERROR_BUFFER_TOO_SMALL;
@@ -766,6 +765,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
     ssize_t rc;
     LIBSSH2_SFTP *sftp_handle;
     struct string_buf buf;
+    unsigned char *endp;
 
     if(session->sftpInit_state == libssh2_NB_state_idle) {
         _libssh2_debug(session, LIBSSH2_TRACE_SFTP,
@@ -916,7 +916,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
     buf.data = data;
     buf.dataptr = buf.data + 1;
     buf.len = data_len;
-    buf.offset = 1;
+    endp = &buf.data[data_len];
 
     if(_libssh2_get_u32(&buf, &(sftp_handle->version)) != 0) {
         LIBSSH2_FREE(session, data);
@@ -933,7 +933,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
     _libssh2_debug(session, LIBSSH2_TRACE_SFTP,
                    "Enabling SFTP version %lu compatibility",
                    sftp_handle->version);
-    while(buf.offset < buf.len) {
+    while(buf.dataptr < endp) {
         unsigned char *extname, *extdata;
 
         if(_libssh2_get_c_string(&buf, &extname) < 0) {