diff --git a/R-Dash/screens/ChangePassword.tsx b/R-Dash/screens/ChangePassword.tsx
index 939407c..0fb52a0 100644
--- a/R-Dash/screens/ChangePassword.tsx
+++ b/R-Dash/screens/ChangePassword.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
diff --git a/R-Dash/screens/CreateTeam.tsx b/R-Dash/screens/CreateTeam.tsx
index 292cc8b..1d6ec38 100644
--- a/R-Dash/screens/CreateTeam.tsx
+++ b/R-Dash/screens/CreateTeam.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import * as DocumentPicker from 'expo-document-picker';
diff --git a/R-Dash/screens/Lap.tsx b/R-Dash/screens/Lap.tsx
index 3641ab4..7046a99 100644
--- a/R-Dash/screens/Lap.tsx
+++ b/R-Dash/screens/Lap.tsx
@@ -1,7 +1,7 @@
 import { BackgroundImage } from '@rneui/base';
-import { StyleSheet, Text, View, TouchableOpacity, ScrollView } from 'react-native';
+import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import MapView, { Point, Polyline } from 'react-native-maps';
+import MapView, { Polyline } from 'react-native-maps';
 import React from 'react';
 import { Lap as LapModel}   from '../core/Lap';
 import TopBar from '../components/TopBar';
diff --git a/R-Dash/screens/Login.tsx b/R-Dash/screens/Login.tsx
index 263e56b..0589704 100644
--- a/R-Dash/screens/Login.tsx
+++ b/R-Dash/screens/Login.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import React from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 // import { AsyncStorage } from 'react-native';
diff --git a/R-Dash/screens/ManageAccount.tsx b/R-Dash/screens/ManageAccount.tsx
index d26c167..b4a1dfb 100644
--- a/R-Dash/screens/ManageAccount.tsx
+++ b/R-Dash/screens/ManageAccount.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import * as DocumentPicker from 'expo-document-picker';
diff --git a/R-Dash/screens/NewTrack.tsx b/R-Dash/screens/NewTrack.tsx
index 61dcf5c..a5e30f3 100644
--- a/R-Dash/screens/NewTrack.tsx
+++ b/R-Dash/screens/NewTrack.tsx
@@ -1,6 +1,5 @@
-import { StatusBar } from 'expo-status-bar';
 import React, { useState } from 'react';
-import { Button, Pressable, StyleSheet, Text, View, Image, TouchableOpacity, TextInput } from 'react-native';
+import { Pressable, StyleSheet, Text, View, Image, TouchableOpacity, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import * as DocumentPicker from 'expo-document-picker';
 import TopBar from '../components/TopBar';
diff --git a/R-Dash/screens/Point_Viewer.tsx b/R-Dash/screens/Point_Viewer.tsx
index 5df41f9..38f7a9c 100644
--- a/R-Dash/screens/Point_Viewer.tsx
+++ b/R-Dash/screens/Point_Viewer.tsx
@@ -1,9 +1,8 @@
 import { BackgroundImage } from '@rneui/base';
 import { StyleSheet, Text, View, TouchableOpacity, ScrollView } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import MapView, { Marker, Polyline } from 'react-native-maps';
+import MapView, { Marker } from 'react-native-maps';
 import React from 'react';
-import { Lap as LapModel}   from '../core/Lap';
 import TopBar from '../components/TopBar';
 import { Point } from '../core/Point';
 
diff --git a/R-Dash/screens/Register.tsx b/R-Dash/screens/Register.tsx
index 577c505..191a946 100644
--- a/R-Dash/screens/Register.tsx
+++ b/R-Dash/screens/Register.tsx
@@ -1,9 +1,7 @@
-import { useState } from 'react';
 import React from 'react';
-import { Button, Pressable, Touchable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import Navigation from '../navigation/Navigation';
 
 export default function Register(props: { navigation: any }) {
     const { navigation } = props;
diff --git a/R-Dash/screens/Team_Info.tsx b/R-Dash/screens/Team_Info.tsx
index bfab0a1..b5d2428 100644
--- a/R-Dash/screens/Team_Info.tsx
+++ b/R-Dash/screens/Team_Info.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
diff --git a/R-Dash/screens/Team_Selection.tsx b/R-Dash/screens/Team_Selection.tsx
index 791929e..5ee4aea 100644
--- a/R-Dash/screens/Team_Selection.tsx
+++ b/R-Dash/screens/Team_Selection.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Button, Pressable, StyleSheet, Text, View } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
 import TopBar from '../components/TopBar';
 
 export default function Team_Selection(props: { navigation: any }) {