diff --git a/src/mapserver.h b/src/mapserver.h
index ca52463..d710145 100644
--- a/src/mapserver.h
+++ b/src/mapserver.h
@@ -1,10 +1,6 @@
 #ifndef MAPSERVERAPI_MAPSERVER_H_
 #define MAPSERVERAPI_MAPSERVER_H_
 
-#ifndef USE_GEOS
-#define USE_GEOS 1
-#endif
-
 int msCGIHandler(const char *query_string, void **out_buffer, size_t *buffer_length);
 void msIO_resetHandlers(void);
 int msSetup(void);
diff --git a/src/mapserverapi.c b/src/mapserverapi.c
index 1d97cb3..88179d0 100644
--- a/src/mapserverapi.c
+++ b/src/mapserverapi.c
@@ -20,17 +20,14 @@ void mapserverapi_init() {
     tmp = g_getenv("MAPSERVERAPI_TMPDIR");
     if (tmp != NULL) {
         __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
-        return;
     }
     tmp = g_getenv("TMPDIR");
     if (tmp != NULL) {
         __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
-        return;
     }
     tmp = g_getenv("TMP");
     if (tmp != NULL) {
         __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
-        return;
     }
     __MAPSERVERAPI_TMPDIR = g_strdup("/tmp");
     if (__MAPSERVER_SETUP == FALSE) {