diff --git a/lib/bpk-appearance/src/BpkAppearance.js b/lib/bpk-appearance/src/BpkAppearance.js
index d2585a0c64..bbaeeea4ed 100644
--- a/lib/bpk-appearance/src/BpkAppearance.js
+++ b/lib/bpk-appearance/src/BpkAppearance.js
@@ -38,9 +38,8 @@ const appearance = {
   addChangeListener: (listener: (BpkAppearancePreferences) => void) => {
     Appearance.addChangeListener(listener);
   },
-  // eslint-disable-next-line no-unused-vars
   removeChangeListener: (listener: (BpkAppearancePreferences) => void) => {
-    // Appearance.addChangeListener(listener).remove();
+    Appearance.addChangeListener(listener).remove();
   },
 };
 
diff --git a/lib/bpk-appearance/src/BpkAppearanceProvider.js b/lib/bpk-appearance/src/BpkAppearanceProvider.js
index e253cc4454..2a9e0c8fd1 100644
--- a/lib/bpk-appearance/src/BpkAppearanceProvider.js
+++ b/lib/bpk-appearance/src/BpkAppearanceProvider.js
@@ -48,7 +48,7 @@ const BpkAppearanceProvider = ({ children, appearanceOverride }: Props) => {
 
     BpkAppearance.addChangeListener(handler);
     return () => {
-      BpkAppearance.removeChangeListener(handler);
+      // BpkAppearance.removeChangeListener(handler);
     };
   }, []);
 
diff --git a/lib/bpk-component-button-link/src/BpkButtonLink.ios.js b/lib/bpk-component-button-link/src/BpkButtonLink.ios.js
index affa315fb1..d833f0fc58 100644
--- a/lib/bpk-component-button-link/src/BpkButtonLink.ios.js
+++ b/lib/bpk-component-button-link/src/BpkButtonLink.ios.js
@@ -20,8 +20,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { View } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { View, TouchableOpacity } from 'react-native';
 
 import { getThemeAttributes, withTheme } from '../../bpk-theming';
 import BpkIcon from '../../bpk-component-icon';
diff --git a/lib/bpk-component-carousel-indicator/src/BpkCarouselIndicator.js b/lib/bpk-component-carousel-indicator/src/BpkCarouselIndicator.js
index 0e5fde092a..8b0e30ed23 100644
--- a/lib/bpk-component-carousel-indicator/src/BpkCarouselIndicator.js
+++ b/lib/bpk-component-carousel-indicator/src/BpkCarouselIndicator.js
@@ -125,14 +125,15 @@ const transitionGroupSorter = (children) =>
 const BpkCarouselIndicator = (props: Props) => {
   const { pageCount, selectedIndex, style, ...rest } = props;
 
-  const indicators = new Array(pageCount).fill().map((_, index) => (
-    <BpkCarouselIndicatorDot
-      // eslint-disable-next-line react/no-array-index-key
-      key={index.toString()}
-      selected={selectedIndex === index}
-      size={getIndicatorSize(pageCount, index, selectedIndex)}
-    />
-  ));
+  const indicators = new Array(pageCount)
+    .fill()
+    .map((_, index) => (
+      <BpkCarouselIndicatorDot
+        key={index.toString()}
+        selected={selectedIndex === index}
+        size={getIndicatorSize(pageCount, index, selectedIndex)}
+      />
+    ));
 
   const { begin, end } = getIndicatorSlice(pageCount, selectedIndex);
 
diff --git a/lib/bpk-component-dialog/src/NativeDialog.ios.js b/lib/bpk-component-dialog/src/NativeDialog.ios.js
index adb72049b9..6c6c3ca295 100644
--- a/lib/bpk-component-dialog/src/NativeDialog.ios.js
+++ b/lib/bpk-component-dialog/src/NativeDialog.ios.js
@@ -25,7 +25,7 @@ import {
   NativeEventEmitter,
   processColor,
 } from 'react-native';
-import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EventEmitter';
+import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/_EmitterSubscription';
 import isNil from 'lodash/isNil';
 import { colors } from '@skyscanner/bpk-foundations-react-native/tokens/base.react.native';
 
diff --git a/lib/bpk-component-navigation-bar/src/BpkNavigationBarBackButtonIOS.ios.js b/lib/bpk-component-navigation-bar/src/BpkNavigationBarBackButtonIOS.ios.js
index 6d68739b98..ba29cefba1 100644
--- a/lib/bpk-component-navigation-bar/src/BpkNavigationBarBackButtonIOS.ios.js
+++ b/lib/bpk-component-navigation-bar/src/BpkNavigationBarBackButtonIOS.ios.js
@@ -20,8 +20,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { I18nManager, Image, StyleSheet } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { I18nManager, Image, StyleSheet, TouchableOpacity } from 'react-native';
 import { textPrimaryColor } from '@skyscanner/bpk-foundations-react-native/tokens/base.react.native';
 
 import BpkText from '../../bpk-component-text';
diff --git a/lib/bpk-component-navigation-bar/src/BpkNavigationBarIconButtonIOS.ios.js b/lib/bpk-component-navigation-bar/src/BpkNavigationBarIconButtonIOS.ios.js
index 538a86ab58..44401defb8 100644
--- a/lib/bpk-component-navigation-bar/src/BpkNavigationBarIconButtonIOS.ios.js
+++ b/lib/bpk-component-navigation-bar/src/BpkNavigationBarIconButtonIOS.ios.js
@@ -20,8 +20,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { StyleSheet, TouchableOpacity } from 'react-native';
 import {
   colorSkyGrayTint04,
   textPrimaryColor,
diff --git a/lib/bpk-component-navigation-bar/src/BpkNavigationBarTextButtonIOS.ios.js b/lib/bpk-component-navigation-bar/src/BpkNavigationBarTextButtonIOS.ios.js
index 473de46565..587cbd81c5 100644
--- a/lib/bpk-component-navigation-bar/src/BpkNavigationBarTextButtonIOS.ios.js
+++ b/lib/bpk-component-navigation-bar/src/BpkNavigationBarTextButtonIOS.ios.js
@@ -20,8 +20,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { StyleSheet, TouchableOpacity } from 'react-native';
 import {
   colorBlackTint05,
   colorSkyGrayTint04,