diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 0d8080c..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ec7431..f29338f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,10 +43,6 @@
         <activity
             android:name=".activity.SharingActivity"
             android:label="@string/title_activity_sharing" />
-        <activity
-            android:name=".activity.MainActivity"
-            android:label="@string/title_activity_sharing"
-            android:launchMode="singleTop" />
 
         <service
             android:name=".service.BackgroundLocalizationService"
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 4492708..37c7a00 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -22,12 +22,10 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.uam.wmi.findmytutor.ListViewAdapter;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
@@ -47,7 +45,6 @@ public abstract class BaseActivity
     // 4 search
     private ListView listView;
     private ArrayList<String> stringArrayList;
-    private ListViewAdapter adapter;
     private SharingFragment sharingFragment;
 
     private static final int REQUEST_PERMISSIONS = 100;
@@ -87,23 +84,6 @@ public abstract class BaseActivity
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
     }
-    private void setData() {
-        stringArrayList = new ArrayList<>();
-        stringArrayList.add("Quynh Trang");
-        stringArrayList.add("Hoang Bien");
-        stringArrayList.add("Duc Tuan");
-        stringArrayList.add("Dang Thanh");
-        stringArrayList.add("Xuan Luu");
-        stringArrayList.add("Phan Thanh");
-        stringArrayList.add("Kim Kien");
-        stringArrayList.add("Ngo Trang");
-        stringArrayList.add("Thanh Ngan");
-        stringArrayList.add("Nguyen Duong");
-        stringArrayList.add("Quoc Cuong");
-        stringArrayList.add("Tran Ha");
-        stringArrayList.add("Vu Danh");
-        stringArrayList.add("Minh Meo");
-    }
 
 
     private void setUpNav() {
@@ -186,10 +166,10 @@ public abstract class BaseActivity
             @Override
             public boolean onQueryTextChange(String newText) {
                 if (TextUtils.isEmpty(newText)) {
-                    adapter.filter("");
-                    listView.clearTextFilter();
+                    //adapter.filter("");
+                    //listView.clearTextFilter();
                 } else {
-                    adapter.filter(newText);
+                    //adapter.filter(newText);
                 }
                 return true;
             }
diff --git a/app/src/main/res/.DS_Store b/app/src/main/res/.DS_Store
deleted file mode 100644
index e0e801d..0000000
Binary files a/app/src/main/res/.DS_Store and /dev/null differ