diff --git a/GNUmakefile b/GNUmakefile
index 7c4ceefde..8e2283edd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -72,8 +72,14 @@ endif
 		CC=$(CC) \
 		go build -trimpath -ldflags $(GO_LDFLAGS) -tags "$(GO_TAGS)" -o $(GO_OUT)
 
-pkg/linux_arm/nomad: CC = arm-linux-gnueabihf-gcc-5
-pkg/linux_arm64/nomad: CC = aarch64-linux-gnu-gcc-5
+ifneq (armv7l,$(THIS_ARCH))
+pkg/linux_arm/nomad: CC = arm-linux-gnueabihf-gcc
+endif
+
+ifneq (aarch64,$(THIS_ARCH))
+pkg/linux_arm64/nomad: CC = aarch64-linux-gnu-gcc
+endif
+
 pkg/windows_%/nomad: GO_OUT = $@.exe
 
 # Define package targets for each of the build targets we actually have on this system
diff --git a/scripts/deps.sh b/scripts/deps.sh
deleted file mode 100755
index 4ab9ad45e..000000000
--- a/scripts/deps.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# First get the OS-specific packages
-GOOS=windows go get "${DEP_ARGS}" github.com/StackExchange/wmi
-GOOS=windows go get "${DEP_ARGS}" github.com/shirou/w32
-GOOS=linux go get "${DEP_ARGS}" github.com/docker/docker/pkg/mount
-GOOS=linux go get "${DEP_ARGS}" github.com/opencontainers/runc/libcontainer/cgroups/fs
-GOOS=linux go get "${DEP_ARGS}" github.com/opencontainers/runc/libcontainer/configs
-GOOS=linux go get "${DEP_ARGS}" github.com/coreos/go-systemd/util
-GOOS=linux go get "${DEP_ARGS}" github.com/coreos/go-systemd/dbus
-
-# Get the rest of the deps
-DEPS=$(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
-go get "${DEP_ARGS}" ./... "${DEPS}"
diff --git a/scripts/test_check.sh b/scripts/test_check.sh
deleted file mode 100755
index 14ea78a9f..000000000
--- a/scripts/test_check.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-echo "Exit code: $(cat exit-code)" >> test.log; 
-grep -A10 'panic: test timed out' test.log || true; 
-grep -A1 -- '--- SKIP:' test.log || true; 
-grep -A1 -- '--- FAIL:' test.log || true; 
-grep '^FAIL' test.log || true;
-exit_code=$(cat exit-code)
-echo "$exit_code "
-if [ "${exit_code}" == "0" ]; then echo "PASS" ; exit 0 ; else echo "TESTS FAILED"; exit 1 ; fi 
-
diff --git a/scripts/travis-consul.sh b/scripts/travis-consul.sh
deleted file mode 100755
index e6d3b8e69..000000000
--- a/scripts/travis-consul.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-
-VERSION="1.6.0"
-OS="linux"
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    OS="darwin"
-fi
-DOWNLOAD=https://releases.hashicorp.com/consul/${VERSION}/consul_${VERSION}_${OS}_amd64.zip
-
-function install_consul() {
-	if [[ -e /usr/bin/consul ]] ; then
-		if [ "v${VERSION}" == "$(consul version | head -n1 | awk '{print $2}')" ] ; then
-			return
-		fi
-	fi
-
-	curl -sSL --fail -o /tmp/consul.zip ${DOWNLOAD}
-
-	unzip -d /tmp /tmp/consul.zip
-	mv /tmp/consul /usr/local/bin/consul
-	chmod +x /usr/local/bin/consul
-}
-
-install_consul
diff --git a/scripts/travis-vault.sh b/scripts/travis-vault.sh
deleted file mode 100755
index 1ce6743a2..000000000
--- a/scripts/travis-vault.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-
-VERSION=0.10.2
-OS="linux"
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    OS="darwin"
-fi
-DOWNLOAD=https://releases.hashicorp.com/vault/${VERSION}/vault_${VERSION}_${OS}_amd64.zip
-
-function install_vault() {
-	if [[ -e /usr/bin/vault ]] ; then
-		if [ "v${VERSION}" = "$(vault version | head -n1 | awk '{print $2}')" ] ; then
-			return
-		fi
-	fi
-	
-	curl -sSL --fail -o /tmp/vault.zip ${DOWNLOAD}
-
-	unzip -d /tmp /tmp/vault.zip
-	mv /tmp/vault /usr/local/bin/vault
-	chmod +x /usr/local/bin/vault
-}
-
-install_vault
diff --git a/scripts/update_docker.sh b/scripts/update_docker.sh
deleted file mode 100755
index dc3972b80..000000000
--- a/scripts/update_docker.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-DOCKER_VERSION="1.10.3"
-
-sudo stop docker
-sudo rm -rf /var/lib/docker
-sudo rm -f "$(command -v docker)"
-sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
-sudo apt-get update
-sudo apt-get install -y --force-yes -o Dpkg::Options::="--force-confnew" docker-engine="$DOCKER_VERSION-0~$(lsb_release -cs)"
-
-docker version
diff --git a/scripts/vagrant-linux-priv-config.sh b/scripts/vagrant-linux-priv-config.sh
index df144e67f..5d7126a3b 100755
--- a/scripts/vagrant-linux-priv-config.sh
+++ b/scripts/vagrant-linux-priv-config.sh
@@ -31,9 +31,9 @@ apt-get install -y \
 apt-get install -y \
 	binutils-aarch64-linux-gnu \
 	binutils-arm-linux-gnueabihf \
-	gcc-5-aarch64-linux-gnu \
-	gcc-5-arm-linux-gnueabihf \
-	gcc-5-multilib-arm-linux-gnueabihf
+	gcc-aarch64-linux-gnu \
+	gcc-arm-linux-gnueabihf \
+	gcc-multilib-arm-linux-gnueabihf
 
 # Install Windows build utilities
 apt-get install -y \