diff --git a/.travis.yml b/.travis.yml
index a060f88f..675d6a48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,11 +53,7 @@ before_install:
  - curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz
  - tar -xzf libmicrohttpd-0.9.59.tar.gz
  - cd libmicrohttpd-0.9.59
- - if [[ "$ARM_ARCH_DIR" != "" ]]; then
-     ./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples;
-   else
-     if [ "$TRAVIS_OS_NAME" != "windows" ]; then $buildshell ./configure --disable-examples; else $buildshell ./configure --disable-examples --enable-poll=no; fi;
-   fi
+ - if [ "$TRAVIS_OS_NAME" != "windows" ]; then $buildshell ./configure --disable-examples; else $buildshell ./configure --disable-examples --enable-poll=no; fi;
  - $buildshell make
  - if [ "$TRAVIS_OS_NAME" != "windows" ]; then sudo make install; else $buildshell make install; fi
  - cd ..
@@ -67,15 +63,6 @@ before_install:
  - if [ "$BUILD_TYPE" = "tsan" ]; then export CFLAGS='-fsanitize=thread'; export CXXLAGS='-fsanitize=thread'; export LDFLAGS='-fsanitize=thread'; fi
  - if [ "$BUILD_TYPE" = "ubsan" ]; then export export CFLAGS='-fsanitize=undefined'; export CXXLAGS='-fsanitize=undefined'; export LDFLAGS='-fsanitize=undefined'; fi
 install:
- - if [[ "$CROSS_COMPILE" == 1 ]] ; then
-     if [[ "$ARM_ARCH_DIR" == "aarch64-linux-gnu" ]] ; then
-       mkdir $HOME/linker_bin ;
-       ln -s /usr/bin/aarch64-linux-gnu-ld $HOME/linker_bin/ld ;
-       LD=$HOME/linker_bin/ld ;
-       echo "SETTING GNU LINKER DIR" ;
-       ls -al $HOME/linker_bin/ld ;
-     fi
-   fi
  - $buildshell ./bootstrap
  - mkdir build
  - cd build
@@ -86,39 +73,13 @@ install:
      $buildshell ../configure --enable-debug --enable-coverage --disable-shared --disable-fastopen;
    elif [ "$DEBUG" = "debug" ]; then
      $buildshell ../configure --enable-debug --disable-shared --disable-fastopen;
-   elif [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then 
-     $buildshell ../configure --disable-fastopen --build `../config.guess` --host aarch64-linux-gnu CC="gcc -B$HOME/linker_bin" CXX="g++ -B$HOME/linker_bin";
-   elif [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "arm-linux-gnueabi" ]; then 
-     $buildshell ../configure --disable-fastopen --build `../config.guess` --host arm-linux-gnueabi;
    elif [ "$VALGRIND" = "valgrind" ]; then
      $buildshell ../configure --enable-debug --disable-fastopen --disable-valgrind-helgrind --disable-valgrind-drd --disable-valgrind-sgcheck;
    else
      $buildshell ../configure --disable-fastopen;
    fi
- - if [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then sed -i 's+/usr/bin/ld+$HOME/linker_bin/ld+g' libtool; fi
- - if [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then sed -i 's+/usr/bin/ld+$HOME/linker_bin/ld+g' Makefile; fi
  - $buildshell make
 script:
- - if [[ "$CROSS_COMPILE" == 1 ]]; then
-     cd test ;
-     if [[ "$ARM_ARCH_DIR" == "aarch64-linux-gnu" ]]; then
-       file ./.libs/basic;
-       file ./.libs/http_utils;
-       file ./.libs/threaded;
-
-       qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./.libs/basic ;
-       qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./.libs/http_utils ;
-       qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./.libs/threaded ;
-     else
-       file ./.libs/basic;
-       file ./.libs/http_utils;
-       file ./.libs/threaded;
-
-       qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/basic ;
-       qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/http_utils ;
-       qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/threaded ;
-     fi
-   fi
  - $buildshell make check
  - $buildshell cat test/test-suite.log
  - if [ "$VALGRIND" = "valgrind" ]; then make check-valgrind; fi;
@@ -284,22 +245,6 @@ matrix:
             - apache2-utils
       env:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && PERFORMANCE=threads"
-    #- os: osx
-    #  osx_image: xcode8
-    #  env:
-    #    - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
-    #- os: osx
-    #  osx_image: xcode8
-    #  env:
-    #    - MATRIX_EVAL="brew install gcc5 && CC=gcc-5 && CXX=g++-5"
-    #- os: osx
-    #  osx_image: xcode8
-    #  env:
-    #    - MATRIX_EVAL="brew install gcc6 && CC=gcc-6 && CXX=g++-6"
-    #- os: osx
-    #  osx_image: xcode8
-    #  env:
-    #    - MATRIX_EVAL="brew install gcc && CC=gcc-7 && CXX=g++-7"
     # works on Precise and Trusty
     - os: linux
       addons:
@@ -398,35 +343,3 @@ matrix:
             - clang-9
       env:
         - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-3.9
-            - g++-arm-linux-gnueabi
-            - g++-multilib
-            - gcc-multilib
-            - qemu
-            - qemu-system-arm
-      env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc"
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-3.9
-            - g++-4.8-aarch64-linux-gnu
-            - gcc-4.8-aarch64-linux-gnu
-            - g++-4.8-multilib
-            - gcc-4.8-multilib
-            - qemu
-            - qemu-system-arm
-      env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu"
-  allow_failures:
-    - env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc"
-    - env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu"