diff --git a/50-touchpad-cmt-alex.conf b/50-touchpad-cmt-alex.conf
deleted file mode 100644
index 7e20c0c..0000000
--- a/50-touchpad-cmt-alex.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad alex"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "SynPS/2 Synaptics TouchPad"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    Option          "Pressure Calibration Offset" "-42.2"
-    Option          "Pressure Calibration Slope" "1.61"
-    Option          "Tap Minimum Pressure" "15.0"
-    Option          "Input Queue Max Delay" "0.026"
-    Option          "Fling Stop Timeout" "0.04"
-    # Bounds overrides:
-    Option          "Active Area Left" "1265"
-    Option          "Active Area Right" "5678"
-    Option          "Active Area Top" "1165"
-    Option          "Active Area Bottom" "4689"
-    # Enable Stationary Classifier
-    Option          "Stationary Wiggle Filter Enabled" "1"
-    # Disable IIR filter
-    Option          "IIR b0" "1"
-    Option          "IIR b1" "0"
-    Option          "IIR b2" "0"
-    Option          "IIR b3" "0"
-    Option          "IIR a1" "0"
-    Option          "IIR a2" "0"
-    Option          "IIR Distance Threshold" "1000"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
diff --git a/50-touchpad-cmt-butterfly.conf b/50-touchpad-cmt-butterfly.conf
deleted file mode 100644
index 4d0eea3..0000000
--- a/50-touchpad-cmt-butterfly.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad butterfly"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "cyapa"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    # Disable some causes of delay
-    Option          "IIR b0" "1"
-    Option          "IIR b1" "0"
-    Option          "IIR b2" "0"
-    Option          "IIR b3" "0"
-    Option          "IIR a1" "0"
-    Option          "IIR a2" "0"
-    Option          "IIR Distance Threshold" "1000"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
-
-Section "InputClass"
-    Identifier      "touchpad butterfly cyapa"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "cyapa"
-    Option          "Integrated Touchpad" "1"
-    Option          "Pressure Calibration Offset" "-7.20313156370106"
-    Option          "Pressure Calibration Slope" "3.95266938056467"
-    # Extra filters for Cyapa
-    Option          "Box Width" "1.0"
-    Option          "Box Height" "1.0"
-    Option          "Sensor Jump Filter Enable" "1"
-    Option          "Sensor Jump Min Dist Move" "0.9"
-    Option          "Sensor Jump Similar Multiplier Move" "1.5"
-    Option          "Sensor Jump Min Dist Non-Move" "0.3"
-    Option          "Adjust IIR History On Warp" "1"
-    Option          "Max Allowed Pressure Change Per Sec" "8000"
-    Option          "Max Hysteresis Pressure Per Sec" "8000"
-    Option          "Delay On Possible Liftoff" "1"
-    Option          "Input Queue Max Delay" "0.019"
-    Option          "Split Corrector Enabled" "1"
-    Option          "Palm Pressure" "250"
-    Option          "Pinch Enable" "0"
-EndSection
-
diff --git a/50-touchpad-cmt-link.conf b/50-touchpad-cmt-link.conf
deleted file mode 100644
index 1d1771d..0000000
--- a/50-touchpad-cmt-link.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad link"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "Atmel|cyapa"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    # Disable some causes of delay
-    Option          "IIR b0" "1"
-    Option          "IIR b1" "0"
-    Option          "IIR b2" "0"
-    Option          "IIR b3" "0"
-    Option          "IIR a1" "0"
-    Option          "IIR a2" "0"
-    Option          "IIR Distance Threshold" "1000"
-    # The flexible case can cause accidental physical clicks
-    Option          "Zero Finger Click Enable" "0"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-EndSection
-
-Section "InputClass"
-    Identifier      "touchpad link cyapa"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "cyapa"
-    Option          "Pressure Calibration Offset" "-5.2469650828279"
-    Option          "Pressure Calibration Slope" "1.7398671681412"
-    # Extra filters for Cyapa
-    Option          "Box Width" "1.0"
-    Option          "Box Height" "1.0"
-    Option          "Sensor Jump Filter Enable" "1"
-EndSection
-
-Section "InputClass"
-    Identifier      "touchpad link atmel"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "Atmel"
-    Option          "Pressure Calibration Offset" "-15.369282490859"
-    Option          "Pressure Calibration Slope" "1.3219851012421"
-    # TODO(clchiou): Calibrate bias on X-axis
-    Option          "Touchpad Device Output Bias on X-Axis" "26.68917773528923"
-    Option          "Touchpad Device Output Bias on Y-Axis" "26.68917773528923"
-    # We see lots of pressure changes under normal use, so raise thresholds
-    Option          "Max Allowed Pressure Change Per Sec" "100000.0"
-    Option          "Max Hysteresis Pressure Per Sec" "100000.0"
-    # People complain that light tap clicks don't register
-    Option          "Tap Minimum Pressure" "21.0"
-    Option          "Box Width" "0.3"
-    Option          "Box Height" "0.3"
-    # Fix for finger merge issue
-    Option          "Finger Merge Filter Enabled" "1"
-    # Fix for finger split issue
-    Option          "Split Corrector Enabled" "1"
-    Option          "Split Merge Max Separation" "14"
-EndSection
-
-# Not CMT related. This is to enable TouchNoiseFilter on Pixel touchscreen.
-Section "InputClass"
-    Identifier "Atmel touchscreen"
-    MatchIsTouchscreen "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "Atmel"
-    Option "EnableTouchNoiseFilter" "1"
-EndSection
diff --git a/50-touchpad-cmt-lumpy.conf b/50-touchpad-cmt-lumpy.conf
deleted file mode 100644
index 0339d6f..0000000
--- a/50-touchpad-cmt-lumpy.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad lumpy"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "Atmel|cyapa"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    # Disable some causes of delay
-    Option          "IIR b0" "1"
-    Option          "IIR b1" "0"
-    Option          "IIR b2" "0"
-    Option          "IIR b3" "0"
-    Option          "IIR a1" "0"
-    Option          "IIR a2" "0"
-    Option          "IIR Distance Threshold" "1000"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
-
-Section "InputClass"
-    Identifier      "touchpad lumpy cyapa"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "cyapa"
-    Option          "Pressure Calibration Offset" "-4.0418716653545"
-    Option          "Pressure Calibration Slope" "1.9403694168841"
-    # Extra filters for Cyapa
-    Option          "Box Width" "1.0"
-    Option          "Box Height" "1.0"
-
-    Option          "Sensor Jump Filter Enable" "1"
-    Option          "Sensor Jump Min Dist Non-Move" "1.0"
-    Option          "Sensor Jump Min Dist Move" "1.0"
-    Option          "Sensor Jump No Warp Min Dist Move" "0.95"
-
-    Option          "Non-linearity correction data file" "/usr/share/gestures/lumpy_linearity.dat"
-    Option          "Enable non-linearity correction" "1"
-
-    Option          "Split Corrector Enabled" "1"
-    Option          "Pinch Enable" "0"
-EndSection
-
-Section "InputClass"
-    Identifier      "touchpad lumpy atmel"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "Atmel"
-    Option          "Pressure Calibration Offset" "-15.369282490859"
-    Option          "Pressure Calibration Slope" "1.3219851012421"
-    # TODO(clchiou): Calibrate bias on X-axis
-    Option          "Touchpad Device Output Bias on X-Axis" "26.68917773528923"
-    Option          "Touchpad Device Output Bias on Y-Axis" "26.68917773528923"
-    # We see lots of pressure changes under normal use, so raise thresholds
-    Option          "Max Allowed Pressure Change Per Sec" "100000.0"
-    Option          "Max Hysteresis Pressure Per Sec" "100000.0"
-EndSection
diff --git a/50-touchpad-cmt-mario.conf b/50-touchpad-cmt-mario.conf
deleted file mode 100644
index 5058724..0000000
--- a/50-touchpad-cmt-mario.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad mario"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "SynPS/2 Synaptics TouchPad"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    Option          "Pressure Calibration Offset" "-23.2"
-    Option          "Pressure Calibration Slope" "1.21"
-    Option          "Input Queue Delay" "0.017"
-    # Bounds overrides:
-    Option          "Active Area Left" "1217"
-    Option          "Active Area Right" "5733"
-    Option          "Active Area Top" "1061"
-    Option          "Active Area Bottom" "4798"
-    # Palm overrides:
-    Option          "Palm Pressure" "235.0"
-    # SemiMT overrides:
-    Option          "SemiMT Correcting Filter Enable" "1"
-    # Tapping Finger Min Separation Distance overrides:
-    Option          "Tap Min Separation" "0.0"
-    # Max Pressure Change overrides:
-    Option          "Max Allowed Pressure Change Per Sec" "2200.0"
-    Option          "Max Hysteresis Pressure Per Sec" "1200.0"
-    # Double Fling Buffer Depth due to 2x Interpolation
-    Option          "Fling Buffer Depth" "20"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
diff --git a/50-touchpad-cmt-parrot.conf b/50-touchpad-cmt-parrot.conf
deleted file mode 100644
index 8ace0c3..0000000
--- a/50-touchpad-cmt-parrot.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad parrot"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "cyapa"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    # Disable some causes of delay
-    Option          "IIR b0" "1"
-    Option          "IIR b1" "0"
-    Option          "IIR b2" "0"
-    Option          "IIR b3" "0"
-    Option          "IIR a1" "0"
-    Option          "IIR a2" "0"
-    Option          "IIR Distance Threshold" "1000"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
-
-Section "InputClass"
-    Identifier      "touchpad parrot cyapa"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "cyapa"
-    Option          "Pressure Calibration Offset" "-13.034105833098"
-    Option          "Pressure Calibration Slope" "1.847199617737"
-    # Extra filters for Cyapa
-    Option          "Box Width" "1.0"
-    Option          "Box Height" "1.0"
-    Option          "Sensor Jump Filter Enable" "1"
-    Option          "Merge Max Ratio" "0.63"
-    Option          "Split Merge Max Movement" "7.1"
-    Option          "Max Allowed Pressure Change Per Sec" "4000"
-    Option          "Max Hysteresis Pressure Per Sec" "4000"
-    Option          "Delay On Possible Liftoff" "1"
-    Option          "Input Queue Max Delay" "0.019"
-    Option          "Split Corrector Enabled" "1"
-    Option          "Pinch Enable" "0"
-EndSection
-
diff --git a/50-touchpad-cmt-stout.conf b/50-touchpad-cmt-stout.conf
deleted file mode 100644
index 143cd38..0000000
--- a/50-touchpad-cmt-stout.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad stout"
-    MatchIsTouchpad "on"
-    MatchProduct    "SynPS/2 Synaptics TouchPad"
-    MatchDevicePath "/dev/input/event*"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    Option          "Pressure Calibration Offset" "-46.5105265656204"
-    Option          "Pressure Calibration Slope" "1.5272358063547"
-    # Bounds overrides:
-    Option          "Active Area Left" "1176"
-    Option          "Active Area Right" "5767"
-    Option          "Active Area Top" "413"
-    Option          "Active Area Bottom" "5534"
-    # Resolution overrides:
-    Option          "Vertical Resolution" "142"
-    Option          "Horizontal Resolution" "62"
-    # Reduce palm detection edge zone
-    Option          "Tap Exclusion Border Width" "1"
-    Option          "Palm Edge Zone Width" "2"
-    # Disable some causes of delay
-    Option          "IIR b0" "1"
-    Option          "IIR b1" "0"
-    Option          "IIR b2" "0"
-    Option          "IIR b3" "0"
-    Option          "IIR a1" "0"
-    Option          "IIR a2" "0"
-    Option          "IIR Distance Threshold" "1000"
-    # Pressure change overrides
-    Option          "Max Pressure Change Duration" "0.02"
-    Option          "Max Allowed Pressure Change Per Sec" "1200"
-    Option          "Max Hysteresis Pressure Per Sec" "1000"
-    # Reduce min. tap pressure
-    Option          "Tap Minimum Pressure" "10"
-    # Reduce max. wiggle distance
-    Option          "Wiggle Max Distance" "4.0"
-    # Box dimension overrides
-    Option          "Box Width" "0.2"
-    Option          "Box Height" "0.2"
-    # Enable Stationary Classifier
-    Option          "Stationary Wiggle Filter Enabled" "1"
-    # Enable Liftoff Jump Filter
-    Option          "Delay On Possible Liftoff" "1"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
diff --git a/50-touchpad-cmt-zgb.conf b/50-touchpad-cmt-zgb.conf
deleted file mode 100644
index 87e5c27..0000000
--- a/50-touchpad-cmt-zgb.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configure touchpads to use Chromium Multitouch (cmt) X input driver
-Section "InputClass"
-    Identifier      "touchpad zgb"
-    MatchIsTouchpad "on"
-    MatchDevicePath "/dev/input/event*"
-    MatchProduct    "SynPS/2 Synaptics TouchPad"
-    Option          "Touchpad Stack Version" "1"
-    Option          "Integrated Touchpad" "1"
-    Option          "Pressure Calibration Offset" "-54.6"
-    Option          "Pressure Calibration Slope" "2.01"
-    Option          "Tap Minimum Pressure" "15.0"
-    Option          "Input Queue Delay" "0.017"
-    Option          "Input Queue Max Delay" "0.026"
-    Option          "Fling Stop Timeout" "0.04"
-    # Bounds overrides:
-    Option          "Active Area Left" "1265"
-    Option          "Active Area Right" "5678"
-    Option          "Active Area Top" "1103"
-    Option          "Active Area Bottom" "4754"
-    Option          "Two Finger Vertical Close Distance Thresh" "35.0"
-    Option          "Fling Buffer Suppress Zero Length Scrolls" "0"
-    Option          "Pinch Enable" "0"
-EndSection
diff --git a/files/lumpy_linearity.dat b/files/lumpy_linearity.dat
deleted file mode 100644
index 119f9fe..0000000
--- a/files/lumpy_linearity.dat
+++ /dev/null
Binary files differ