diff --git a/src/build.h b/src/build.h
deleted file mode 100644
index ad4168a..0000000
--- a/src/build.h
+++ /dev/null
@@ -1 +0,0 @@
-#define ZTSDK_BUILD_VERSION  44
diff --git a/src/debug.h b/src/debug.h
index 0627d01..10c2055 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -30,7 +30,7 @@
 #ifndef _SDK_DEBUG_H_
 #define _SDK_DEBUG_H_
 
-#define DEBUG_LEVEL     4 // Set this to adjust what you'd like to see in the debug traces
+#define DEBUG_LEVEL     1 // Set this to adjust what you'd like to see in the debug traces
 
 #define MSG_ERROR       1 // Errors
 #define MSG_TRANSFER    2 // RX/TX specific statements
@@ -106,6 +106,8 @@ extern "C" {
  #else
   #define DEBUG_INFO(fmt, args...)
   #define DEBUG_BLANK(fmt, args...)
+  #define DEBUG_ATTN(fmt, args...)
+  #define DEBUG_STACK(fmt, args...)
  #endif
  #if DEBUG_LEVEL >= MSG_TRANSFER
   #if defined(__ANDROID__)
diff --git a/src/sdk.h b/src/sdk.h
index e37d1c0..777688f 100644
--- a/src/sdk.h
+++ b/src/sdk.h
@@ -76,8 +76,6 @@
     #include <jni.h>
 #endif
 
-#include "build.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/service.cpp b/src/service.cpp
index d998ade..79faa12 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -49,7 +49,6 @@
 #include "tap.hpp"
 #include "sdk.h"
 #include "debug.h"
-#include "build.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/sockets.c b/src/sockets.c
index 2646ad5..80b14a5 100644
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -316,7 +316,7 @@ int (*realclose)(CLOSE_SIG);
             else {
                 perror("read:\n");
             }
-            return tmpsz;
+            return tmpsz <= ZT_MAX_MTU ? tmpsz : -1;
         }
 //#endif