diff --git a/.gitmodules b/.gitmodules
index cc10030..fb51d2b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "vastfmt"]
 	path = vastfmt
 	url = https://github.com/Materdaddy/vastfmt.git
-[submodule "jq"]
-	path = jq
-	url = https://github.com/stedolan/jq.git
diff --git a/fpp_install.sh b/fpp_install.sh
index 0bdc1c4..0528e13 100755
--- a/fpp_install.sh
+++ b/fpp_install.sh
@@ -1,38 +1,24 @@
 #!/bin/bash
 
-if [ -n "$(which g++-4.7)" ]; then
-	CXX=g++-4.7
-else
-	CXX=g++
-fi
-
 pushd $(dirname $(which $0))
 
 git submodule init
 git submodule update
-if [ "$CXX" == "g++" ]; then
-	# We don't support C++11 and need an old version of vastfmt
-	pushd vastfmt
-	git reset --hard 91b76c154d967ba22c5dc25831de6b888065ff87
-	popd
-fi
 
 # Before building, check that we have libusb-1.0-0-dev
 if ! dpkg --get-selections | grep -cq libusb-1.0-0-dev; then
-	$SUDO apt-get -q -y update
-	$SUDO apt-get -q -y --reinstall install libusb-1.0-0-dev
+	sudo apt-get -q -y update
+	sudo apt-get -q -y --reinstall install libusb-1.0-0-dev
 fi
 
-make -C vastfmt CXX=$CXX
+make -C vastfmt
+
 mkdir -p bin
 cp vastfmt/radio bin/rds
 
-# Get jq going for parsing our json data
-pushd jq
-autoreconf -i
-./configure --disable-maintainer-mode
-make src/builtin.inc
-make
-popd
+if ! dpkg --get-selections | grep -cq "^jq"; then
+	sudo apt-get -q -y update
+	sudo apt-get -q -y install jq
+fi
 
 popd
diff --git a/jq b/jq
deleted file mode 160000
index 8f115e9..0000000
--- a/jq
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f115e9eed8e71816b9f3a86e0d3aabd47a750d9