diff --git a/.gitattributes b/.gitattributes
index 1b2dee0be..170b731da 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
 *.xz binary
 dsp/generated/* merge=binary linguist-generated
-cpu_features/** linguist-vendored
 starch/** linguist-vendored
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ec55da61f..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: c
-
-sudo: required
-
-matrix:
-    include:
-        - os: linux
-          dist: trusty
-        - os: osx
-          osx_image: xcode7.3
-        - os: osx
-          osx_image: xcode7.1
-        - os: osx
-          osx_image: beta-xcode6.2
-
-before_install:
-    - if [ `uname` = "Linux" ]; then
-          sudo apt-get update -qq;
-          sudo apt-get install -y build-essential debhelper librtlsdr-dev libusb-1.0-0-dev pkg-config fakeroot libbladerf-dev dh-systemd;
-      elif [ `uname` = "Darwin" ]; then
-          brew update;
-          brew install -v librtlsdr;
-      fi
-
-script:
-    - if [ `uname` = "Linux" ]; then
-          dpkg-buildpackage -b -us -uc;
-      elif [ `uname` = "Darwin" ]; then
-          make;
-         make test;
-      fi
diff --git a/Makefile b/Makefile
index 0006c9744..0a307a40c 100644
--- a/Makefile
+++ b/Makefile
@@ -218,7 +218,7 @@ starch-benchmark: cpu.o dsp/helpers/tables.o $(STARCH_OBJS) $(STARCH_BENCHMARK_O
 	$(CC) -g -o $@ $^ $(LDFLAGS) $(LIBS)
 
 clean:
-	rm -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o cpu_features/src/*.o dsp/generated/*.o dsp/helpers/*.o dump1090 view1090 faup1090 cprtests crctests oneoff/convert_benchmark oneoff/decode_comm_b oneoff/dsp_error_measurement oneoff/uc8_capture_stats starch-benchmark
+	rm -f *.o oneoff/*.o compat/clock_gettime/*.o compat/clock_nanosleep/*.o dsp/generated/*.o dsp/helpers/*.o dump1090 view1090 faup1090 cprtests crctests oneoff/convert_benchmark oneoff/decode_comm_b oneoff/dsp_error_measurement oneoff/uc8_capture_stats starch-benchmark
 
 test: cprtests starch-benchmark
 	./cprtests
diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
deleted file mode 100644
index 025f96dad..000000000
--- a/Makefile.cpufeatures
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- makefile -*-
-
-# cmake integration is a little tricky, so let's do this by hand for now
-
-CPUFEATURES_UNAME ?= $(UNAME)
-CPUFEATURES_ARCH ?= $(ARCH)
-CPUFEATURES_CFLAGS ?= $(CFLAGS)
-
-CPUFEATURES_OBJS := cpu_features/src/filesystem.o cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o
-CPUFEATURES_EXTRA_CFLAGS := -std=c99
-CPUFEATURES_EXTRA_CPPFLAGS := -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG -Icpu_features/include
-
-ifeq ($(CPUFEATURES_UNAME),Linux)
-  CPUFEATURES_OBJS += cpu_features/src/hwcaps.o
-  CPUFEATURES_EXTRA_CPPFLAGS += -DHAVE_STRONG_GETAUXVAL
-else ifeq ($(CPUFEATURES_UNAME),Darwin)
-  CPUFEATURES_EXTRA_CPPFLAGS += -DHAVE_SYSCTLBYNAME
-endif
-
-ifeq ($(CPUFEATURES_ARCH),x86_64)
-  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
-else ifeq ($(CPUFEATURES_ARCH),amd64)
-  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
-else ifneq (,$(filter i%86,$(CPUFEATURES_ARCH)))
-  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
-else ifneq (,$(findstring aarch64,$(CPUFEATURES_ARCH)))
-  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_aarch64.o
-else ifneq (,$(findstring arm64,$(CPUFEATURES_ARCH)))
-  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_aarch64.o
-else ifneq (,$(findstring arm,$(CPUFEATURES_ARCH)))
-  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_arm.o
-endif
-
-$(CPUFEATURES_OBJS): override ALL_CCFLAGS := $(CPUFEATURES_CPPFLAGS) $(CPUFEATURES_EXTRA_CPPFLAGS) $(CPUFEATURES_CFLAGS) $(CPUFEATURES_EXTRA_CFLAGS)