diff --git a/arm/Android.mk b/arm/Android.mk
index eb3c08d..3d0e0ad 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm/BoardConfigVendor.mk b/arm/BoardConfigVendor.mk
index 488d2ea..0d5a5c8 100644
--- a/arm/BoardConfigVendor.mk
+++ b/arm/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index d797bcd..bd32be9 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
-PRODUCT_COPY_FILES += \
-    vendor/gapps/arm/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so:system/priv-app/SetupWizard/lib/arm/libbarhopper.so
 
 PRODUCT_PACKAGES += \
     Velvet
diff --git a/arm/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so b/arm/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so
deleted file mode 100644
index 1096ea2..0000000
Binary files a/arm/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so and /dev/null differ
diff --git a/arm64/Android.mk b/arm64/Android.mk
index e7283e4..c84c48a 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm64/BoardConfigVendor.mk b/arm64/BoardConfigVendor.mk
index 488d2ea..0d5a5c8 100644
--- a/arm64/BoardConfigVendor.mk
+++ b/arm64/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 3651f04..84fdd90 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,9 +21,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
-PRODUCT_COPY_FILES += \
-    vendor/gapps/arm64/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so:system/priv-app/SetupWizard/lib/arm/libbarhopper.so \
-    vendor/gapps/arm64/proprietary/priv-app/SetupWizard/lib/arm64/libbarhopper.so:system/priv-app/SetupWizard/lib/arm64/libbarhopper.so
 
 PRODUCT_PACKAGES += \
     Velvet
diff --git a/arm64/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so b/arm64/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so
deleted file mode 100644
index 1096ea2..0000000
Binary files a/arm64/proprietary/priv-app/SetupWizard/lib/arm/libbarhopper.so and /dev/null differ
diff --git a/arm64/proprietary/priv-app/SetupWizard/lib/arm64/libbarhopper.so b/arm64/proprietary/priv-app/SetupWizard/lib/arm64/libbarhopper.so
deleted file mode 100644
index 5284296..0000000
Binary files a/arm64/proprietary/priv-app/SetupWizard/lib/arm64/libbarhopper.so and /dev/null differ
diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk
index 488d2ea..0d5a5c8 100644
--- a/common/BoardConfigVendor.mk
+++ b/common/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt
index f628ee7..cc6c118 100644
--- a/proprietary-files-arm-nongrouper.txt
+++ b/proprietary-files-arm-nongrouper.txt
@@ -1,2 +1 @@
 -priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555
-priv-app/SetupWizard/lib/arm/libbarhopper.so|3e88402982ab800e369debe0901607e3f504310e
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index 2dfa2a0..82a268f 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,3 +1 @@
 -priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be
-priv-app/SetupWizard/lib/arm/libbarhopper.so|3e88402982ab800e369debe0901607e3f504310e
-priv-app/SetupWizard/lib/arm64/libbarhopper.so|d77445e11ca660ba7c61d5fa467ea1c79de890f6
diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt
index 49c26bb..428dd64 100644
--- a/proprietary-files-x86-nongrouper.txt
+++ b/proprietary-files-x86-nongrouper.txt
@@ -1,2 +1 @@
 -priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced
-priv-app/SetupWizard/lib/x86/libbarhopper.so|a09883b5010f162c5ec9262b4824578d945913b9
diff --git a/x86/Android.mk b/x86/Android.mk
index fd2a5ab..c9a0492 100644
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk
index 488d2ea..0d5a5c8 100644
--- a/x86/BoardConfigVendor.mk
+++ b/x86/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/x86/proprietary/priv-app/SetupWizard/lib/x86/libbarhopper.so b/x86/proprietary/priv-app/SetupWizard/lib/x86/libbarhopper.so
deleted file mode 100644
index 8423941..0000000
Binary files a/x86/proprietary/priv-app/SetupWizard/lib/x86/libbarhopper.so and /dev/null differ
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index e85492d..f758d31 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
-PRODUCT_COPY_FILES += \
-    vendor/gapps/x86/proprietary/priv-app/SetupWizard/lib/x86/libbarhopper.so:system/priv-app/SetupWizard/lib/x86/libbarhopper.so
 
 PRODUCT_PACKAGES += \
     Velvet