diff --git a/App.js b/App.js
index a3881e1..683b772 100644
--- a/App.js
+++ b/App.js
@@ -36,7 +36,6 @@ This screens shouldn't be loaded lazy as it one of the first screens the user se
 
 import OnboardingScreen from "./src/Screens/Onboarding/Onboarding";
 import NoDevicesConnectedScreen from "./src/Screens/NoDevicesConnected";
-import AsyncStorage from "@react-native-async-storage/async-storage";
 /*
   This screens should be loaded lazy as they are they not seen by the user on startup
 */
diff --git a/src/Screens/Device/index.js b/src/Screens/Device/index.js
index 90b90f1..0e0033a 100644
--- a/src/Screens/Device/index.js
+++ b/src/Screens/Device/index.js
@@ -35,7 +35,6 @@ export default function DeviceScreen({ navigation }) {
       const onBackPress = () => {
         if (selectedView === 0) {
         // This will switch from the device settings to the device scene view
-          console.log("set selected view");
           setSelectedView(2);
           return true;
         }
@@ -52,35 +51,6 @@ export default function DeviceScreen({ navigation }) {
     }, [selectedView])
   );
 
-  /*
-  useFocusEffect(
-    useCallback(() => {
-      console.log("open", AppSelectedUserDevice.current);
-
-      const onBackPress = () => {
-        if (selectedView === 0) {
-          console.log("set selected view");
-          setSelectedView(2);
-          return true;
-        } else {
-          console.log("false");
-          return false;
-        }
-      };
-
-      const subscription = BackHandler.addEventListener(
-        "hardwareBackPress",
-        onBackPress
-      );
-
-      return () => {
-        console.log("close");
-        //subscription.remove();
-        BackHandler.removeEventListener("hardwareBackPress", onBackPress);
-      };
-    }, [selectedView])
-  ); */
-
   return (
     <View
       style={{