diff --git a/.gitmodules b/.gitmodules
index d245e71..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/3rdparty/xgboost"]
-	path = src/3rdparty/xgboost
-	url = https://github.com/hunter-packages/xgboost.git
diff --git a/.travis.yml b/.travis.yml
index 57ba47e..5c34e8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty-3.8
     packages:
       - python3
 
@@ -28,6 +29,13 @@ addons:
       # https://github.com/travis-ci-tester/travis-test-clang-cxx-11
       - libstdc++-4.8-dev
 
+      - clang-3.8
+      - libc++-dev
+      - libc++abi-dev
+      - libclang-3.8-dev
+      - libclang-common-3.8-dev
+      - libclang1-3.8
+
       # https://github.com/travis-ci-tester/travis-test-gcc-cxx-11
       - g++-4.8
 
@@ -39,6 +47,8 @@ addons:
 matrix:
   include:
     # Linux {
+    - os: linux
+      env: CONFIG=Release TOOLCHAIN=libcxx INSTALL=--strip TO_STRING=OFF    
     - os: linux
       env: CONFIG=Release TOOLCHAIN=gcc-4-8-pic-hid-sections INSTALL=--strip TO_STRING=OFF
     # - os: linux
@@ -82,6 +92,12 @@ before_install:
   # Add '--quiet' to avoid leaking the token to logs
   - git submodule update --init --recursive --quiet
 
+  # Use a recent clang
+  # - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.8 380; fi
+  # - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.8 380; fi
+
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then mkdir -p latest-clang-symlinks && ln -s /usr/bin/clang-3.8 latest-clang-symlinks/clang && ln -s /usr/bin/clang++-3.8 latest-clang-symlinks/clang++ && export PATH="$PWD/latest-clang-symlinks:$PATH"; fi
+
 install:
   # Info about OS
   - uname -a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 747e958..627efa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.3)
 include("cmake/HunterGate.cmake")
 
 HunterGate(
-  URL "https://github.com/ruslo/hunter/archive/v0.19.68.tar.gz"
-  SHA1 "ad0d042d8ec56a3c6a4bda1e657f1f65b494ab12"
+  URL "https://github.com/ruslo/hunter/archive/v0.19.72.tar.gz"
+  SHA1 "3ed5ea39abf52afab06c77e1b7d7e41e939752f1"  
   FILEPATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/config.cmake"    
 )
 
diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
index 09855c1..1bcf5aa 100644
--- a/cmake/Hunter/config.cmake
+++ b/cmake/Hunter/config.cmake
@@ -4,4 +4,4 @@ set(XGBOOST_CMAKE_ARGS
   XGBOOST_USE_CEREAL=${XGBOOSTER_SERIALIZE_WITH_CEREAL}
   )
 
-hunter_config(xgboost GIT_SUBMODULE "src/3rdparty/xgboost" CMAKE_ARGS ${XGBOOST_CMAKE_ARGS})
+hunter_config(xgboost VERSION ${HUNTER_xgboost_VERSION} CMAKE_ARGS ${XGBOOST_CMAKE_ARGS})
diff --git a/src/3rdparty/xgboost b/src/3rdparty/xgboost
deleted file mode 160000
index 070e939..0000000
--- a/src/3rdparty/xgboost
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 070e93969090ecc26dabc449a7f9619a1ef70b7e