diff --git a/Client/Android/app/src/main/java/com/neptune/app/DeviceActivity.java b/Client/Android/app/src/main/java/com/neptune/app/DeviceActivity.java
index 47d987c..d71a6c2 100644
--- a/Client/Android/app/src/main/java/com/neptune/app/DeviceActivity.java
+++ b/Client/Android/app/src/main/java/com/neptune/app/DeviceActivity.java
@@ -16,8 +16,8 @@
 
 
 public class DeviceActivity extends AppCompatActivity {
-    public Button connect;
-    public Button temp;
+    //public Button connect;
+    //public Button temp;
     public ConnectionManager cm;
 
 
@@ -45,7 +45,7 @@ public void onClick(View v) {
             }
         });
 
-        connect = (Button) findViewById(R.id.connec);
+        /*connect = (Button) findViewById(R.id.connec);
         connect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -59,7 +59,7 @@ public void onClick(View view) {
             public void onClick(View view) {
 
             }
-        });
+        });*/
     }
 
     @Override
diff --git a/Client/Android/app/src/main/java/com/neptune/app/MainActivity.java b/Client/Android/app/src/main/java/com/neptune/app/MainActivity.java
index ab473c0..35d6bb0 100644
--- a/Client/Android/app/src/main/java/com/neptune/app/MainActivity.java
+++ b/Client/Android/app/src/main/java/com/neptune/app/MainActivity.java
@@ -36,7 +36,7 @@ public class MainActivity extends AppCompatActivity implements RenameDialog.Rena
     private Button add;
     private AlertDialog addDialog;
     private LinearLayout addLine;
-    private Button notifListTest;
+    //private Button notifListTest;
     private ImageView delete;
 
     @Override
@@ -44,26 +44,26 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        devName = (TextView) findViewById(R.id.name);
-        editName = (ImageView) findViewById(R.id.editDevName);
+        //devName = (TextView) findViewById(R.id.name);
+        //editName = (ImageView) findViewById(R.id.editDevName);
         add = (Button) findViewById(R.id.addDev);
         addLine = findViewById(R.id.container);
-        notifListTest = findViewById(R.id.notifTest);
+        //notifListTest = findViewById(R.id.notifTest);
         buildAddDialog();
 
-        devName.setOnClickListener(new TextView.OnClickListener(){
+        /*devName.setOnClickListener(new TextView.OnClickListener(){
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(MainActivity.this, DeviceActivity.class));
             }
-        });
+        });*/
 
-        editName.setOnClickListener(new ImageView.OnClickListener(){
+        /*editName.setOnClickListener(new ImageView.OnClickListener(){
             @Override
             public void onClick(View v) {
                 openDialog();
             }
-        });
+        });*/
 
         add.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -73,7 +73,7 @@ public void onClick(View view) {
         });
 
         //Part of the Notification Button
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        /*if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel("My notification", "My notification", NotificationManager.IMPORTANCE_DEFAULT);
             NotificationManager manager = getSystemService(NotificationManager.class);
             manager.createNotificationChannel(channel);
@@ -94,7 +94,7 @@ public void onClick(View view) {
                 notificationManagerCompat.notify(1,buidler.build());
 
             }
-        });
+        });*/
     }
 
     private void buildAddDialog() {
@@ -156,9 +156,13 @@ public void onClick(View v) {
         delete.setOnClickListener(new ImageView.OnClickListener() {
             @Override
             public void onClick(View v) {
-                server = serverManager.getServer(devName.getText().toString());
-                serverManager.removeServer(server);
-                server.unpair();
+                /*try{
+                    server = serverManager.getServer(devName.getText().toString());
+                    serverManager.removeServer(server);
+                } catch (Exception e) {
+
+                }
+                server.unpair();*/
                 addLine.removeView(view);
             }
         });
diff --git a/Client/Android/app/src/main/res/layout/activity_device.xml b/Client/Android/app/src/main/res/layout/activity_device.xml
index d5caca2..6742ec7 100644
--- a/Client/Android/app/src/main/res/layout/activity_device.xml
+++ b/Client/Android/app/src/main/res/layout/activity_device.xml
@@ -255,7 +255,7 @@
             tools:ignore="ExtraText,OnClick,TouchTargetSizeCheck" />
     </RadioGroup>
 
-    <Button
+    <!--<Button
         android:id="@+id/connec"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -273,7 +273,7 @@
         android:layout_marginEnd="60dp"
         android:text="Nothing For Now"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />-->
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/Android/app/src/main/res/layout/activity_main.xml b/Client/Android/app/src/main/res/layout/activity_main.xml
index ac33259..0c1cd48 100644
--- a/Client/Android/app/src/main/res/layout/activity_main.xml
+++ b/Client/Android/app/src/main/res/layout/activity_main.xml
@@ -70,7 +70,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <!--<ImageView
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -80,9 +80,9 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.104"
         app:srcCompat="@drawable/desktop_connection_logo"
-        tools:ignore="ImageContrastCheck" />
+        tools:ignore="ImageContrastCheck" />-->
 
-    <ImageView
+    <!--<ImageView
         android:id="@+id/editDevName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -97,9 +97,9 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/change_name_pencil_logo"
-        tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />
+        tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />-->
 
-    <TextView
+    <!--<TextView
         android:id="@+id/name"
         android:layout_width="244dp"
         android:layout_height="24dp"
@@ -112,15 +112,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.104"
-        tools:ignore="TouchTargetSizeCheck" />
+        tools:ignore="TouchTargetSizeCheck" />-->
 
     <ScrollView
         android:layout_width="417dp"
         android:layout_height="621dp"
-        android:layout_marginTop="5dp"
         android:scrollbars="none"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editDevName"
+        app:layout_constraintTop_toBottomOf="@+id/addDev"
         tools:ignore="SpeakableTextPresentCheck">
 
         <LinearLayout
@@ -132,7 +131,7 @@
         </LinearLayout>
     </ScrollView>
 
-    <Button
+    <!--<Button
         android:id="@+id/notifTest"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -140,6 +139,6 @@
         android:layout_marginEnd="100dp"
         android:text="Button"
         app:layout_constraintEnd_toStartOf="@+id/editDevName"
-        app:layout_constraintTop_toBottomOf="@+id/addDev" />
+        app:layout_constraintTop_toBottomOf="@+id/addDev" />-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file