diff --git a/lib/Basics/StringUtils.cpp b/lib/Basics/StringUtils.cpp
index e38197e3ed..4d3b63148d 100644
--- a/lib/Basics/StringUtils.cpp
+++ b/lib/Basics/StringUtils.cpp
@@ -37,15 +37,6 @@
 #include "Basics/Exceptions.h"
 #include "Basics/StringBuffer.h"
 
-// TODO need to do this in another way
-#ifndef TRI_HAVE_GLOBAL_TIMEZONE_PROTO
-#ifdef GLOBAL_TIMEZONE
-extern long GLOBAL_TIMEZONE;
-#else
-static long GLOBAL_TIMEZONE = 0;
-#endif
-#endif
-
 using namespace std;
 
 // -----------------------------------------------------------------------------
@@ -57,57 +48,16 @@ namespace {
     return a == ' ' || a == '\t' || a == '_';
   }
 
-
-
-  int32_t matchInteger (char const * & str, size_t size) {
-    int32_t result = 0;
-
-    for (size_t i = 0;  i < size;  i++, str++) {
-      if ('0' <= *str && *str <= '9') {
-        result = result * 10 + (*str - '0');
-      }
-      else {
-        std::string message("cannot parse date, expecting integer, got '" + string(1, *str) + "'");
-        THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER, message);
-      }
-    }
-
-    return result;
-  }
-
-
-
-  int32_t matchInteger (char const * & str) {
-    int32_t result = 0;
-
-    for (;  *str;  str++) {
-      if ('0' <= *str && *str <= '9') {
-        result = result * 10 + (*str - '0');
-      }
-      else {
-        return result;
-      }
-    }
-
-    return result;
-  }
-
-
-
   char const * const BASE64_CHARS =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "abcdefghijklmnopqrstuvwxyz"
     "0123456789+/";
 
-
-
   char const * const BASE64U_CHARS =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "abcdefghijklmnopqrstuvwxyz"
     "0123456789-_";
 
-
-
   unsigned char const BASE64_REVS[256] = {
     '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',   //   0
     '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',   //  16
diff --git a/lib/Basics/operating-system.h b/lib/Basics/operating-system.h
index 4fb775a8b3..b308ff6e6c 100644
--- a/lib/Basics/operating-system.h
+++ b/lib/Basics/operating-system.h
@@ -116,8 +116,6 @@
 /// @brief available features
 ////////////////////////////////////////////////////////////////////////////////
 
-#define GLOBAL_TIMEZONE                     timezone
-
 #define TRI_HAVE_POSIX                      1
 
 #define TRI_HAVE_MACOS_MEM_STATS            1
@@ -463,8 +461,6 @@
 /// @brief available features
 ////////////////////////////////////////////////////////////////////////////////
 
-#define GLOBAL_TIMEZONE                     timezone
-
 #define TRI_GCC_THREAD_LOCAL_STORAGE        1
 
 #define TRI_HAVE_POSIX                      1
@@ -646,9 +642,6 @@
 
 #define TRI_HAVE_LINENOISE                  1
 
-#define GLOBAL_TIMEZONE                     _timezone
-#define TRI_HAVE_GLOBAL_TIMEZONE_PROTO      1
-
 #define YY_NO_UNISTD_H                      1
 
 #define TRI_WIN32_CONSOLE                   1