diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index 4cbbf076..6752d4b6 100644
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -1,172 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mpris_control_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
     android:gravity="center"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/no_players"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:text="@string/no_players_connected"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <Spinner
         android:id="@+id/player_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
 
     <TextView
         android:id="@+id/now_playing_textview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:ellipsize="marquee"
         android:gravity="center"
         android:marqueeRepeatLimit="marquee_forever"
         android:padding="8dip"
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <ImageButton
         android:id="@+id/play_button"
         android:layout_width="fill_parent"
         android:layout_height="75dp"
         android:layout_gravity="center"
         android:layout_weight="0"
         android:adjustViewBounds="false"
         android:baselineAlignBottom="true"
         android:clickable="false"
         android:contentDescription="@string/mpris_play"
         android:src="@drawable/ic_play_black" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="60dip"
         android:layout_gravity="center"
         android:orientation="horizontal">
 
         <ImageButton
             android:id="@+id/prev_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_previous"
             android:src="@drawable/ic_previous_black" />
 
         <ImageButton
             android:id="@+id/rew_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_rew"
             android:src="@drawable/ic_rewind_black" />
 
         <ImageButton
             android:id="@+id/ff_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_ff"
             android:src="@drawable/ic_fast_forward_black" />
 
         <ImageButton
             android:id="@+id/next_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_next"
             android:src="@drawable/ic_next_black" />
 
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/progress_slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/progress_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
             android:padding="8dip"
             android:singleLine="true"
             android:text="00:00"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <SeekBar
             android:id="@+id/positionSeek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1" />
 
         <TextView
             android:id="@+id/time_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
             android:padding="8dip"
             android:singleLine="true"
             android:text="00:00"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/volume_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="8dip"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/imageView"
             android:layout_width="30dip"
             android:layout_height="30dip"
             android:layout_marginEnd="10dip"
             android:layout_marginRight="10dip"
             android:layout_weight="0"
             android:contentDescription="@string/mpris_volume"
             android:maxWidth="30dip"
             android:src="@drawable/ic_volume_black" />
 
 
         <SeekBar
             android:id="@+id/volume_seek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
             android:max="100" />
 
     </LinearLayout>
 
-    <!--
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_pause"
-                android:layout_gravity="center"/>
-
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_stop"
-                android:layout_gravity="center"/>
-    -->
 </LinearLayout>
diff --git a/res/layout/nav_header.xml b/res/layout/nav_header.xml
index 47816ac4..18f0ed4f 100644
--- a/res/layout/nav_header.xml
+++ b/res/layout/nav_header.xml
@@ -1,52 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="160dp"
     android:background="@drawable/drawer_header"
     android:gravity="bottom"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/kdeconnect_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="48dp"
         android:paddingLeft="16dp"
         android:paddingRight="48dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
         android:text="KDE Connect"
         android:textColor="#FFF"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/device_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="0dp"
         android:paddingBottom="16dp"
         android:paddingEnd="48dp"
         android:paddingLeft="16dp"
         android:paddingRight="48dp"
         android:paddingStart="16dp"
         android:paddingTop="4dp"
         android:text="My device"
         android:textColor="#fff" />
 
-    <!--
-    <ImageView
-        android:src="@drawable/ic_action_image_edit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:clickable="true"
-        android:background="@drawable/abc_list_selector_holo_dark"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/rename_device"
-        android:id="@+id/rename"
-    />
-    -->
-
 </LinearLayout>
diff --git a/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java b/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
index f02ce203..e37f949d 100644
--- a/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java
@@ -1,204 +1,114 @@
 /*
  * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 */
 
 package org.kde.kdeconnect.Plugins.TelepathyPlugin;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.telephony.SmsManager;
 import android.util.Log;
 
 import java.util.ArrayList;
 
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin;
 import org.kde.kdeconnect_tp.R;
 
 public class TelepathyPlugin extends Plugin {
 
 
     public final static String PACKAGE_TYPE_SMS_REQUEST = "kdeconnect.sms.request";
 
     private int telepathyPermissionExplanation = R.string.telepathy_permission_explanation;
 
     @Override
     public boolean onCreate() {
         permissionExplanation = telepathyPermissionExplanation;
         return true;
     }
 
     @Override
     public String getDisplayName() {
         return context.getResources().getString(R.string.pref_plugin_telepathy);
     }
 
     @Override
     public String getDescription() {
         return context.getResources().getString(R.string.pref_plugin_telepathy_desc);
     }
 
     @Override
     public void onDestroy() {
     }
 
     @Override
     public boolean onPackageReceived(NetworkPackage np) {
 
         if (!np.getType().equals(PACKAGE_TYPE_SMS_REQUEST)) {
             return false;
         }
 
         if (np.getBoolean("sendSms")) {
             String phoneNo = np.getString("phoneNumber");
             String sms = np.getString("messageBody");
             try {
                 int permissionCheck = ContextCompat.checkSelfPermission(context,
                         Manifest.permission.SEND_SMS);
 
                 if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
                     SmsManager smsManager = SmsManager.getDefault();
 
                     ArrayList<String> parts = smsManager.divideMessage(sms);
 
-                    // If this message turns out to fit in a single SMS, sendMultpartTextMessage
+                    // If this message turns out to fit in a single SMS, sendMultipartTextMessage
                     // properly handles that case
                     smsManager.sendMultipartTextMessage(phoneNo, null, parts, null, null);
                 } else if (permissionCheck == PackageManager.PERMISSION_DENIED) {
                     // TODO Request Permission SEND_SMS
                 }
                 //TODO: Notify other end
             } catch (Exception e) {
                 //TODO: Notify other end
                 Log.e("TelepathyPlugin", e.getMessage());
                 e.printStackTrace();
             }
         }
 
-/*
-        if (np.getBoolean("requestContacts")) {
-
-            ArrayList<String> vCards = new ArrayList<String>();
-
-            Cursor cursor = context.getContentResolver().query(
-                    Contacts.CONTENT_URI,
-                    null,
-                    Contacts.HAS_PHONE_NUMBER + " > 0 ",
-                    null,
-                    null
-            );
-
-            if (cursor != null && cursor.moveToFirst()) {
-                try {
-                    do {
-                        String lookupKey = cursor.getString(cursor.getColumnIndex(Contacts.LOOKUP_KEY));
-                        Uri uri = Uri.withAppendedPath(Contacts.CONTENT_VCARD_URI, lookupKey);
-                        AssetFileDescriptor fd = null;
-                        try {
-                            fd = context.getContentResolver()
-                                    .openAssetFileDescriptor(uri, "r");
-                            FileInputStream fis = fd.createInputStream();
-                            byte[] b = new byte[(int) fd.getDeclaredLength()];
-                            fis.read(b);
-                            String vCard = new String(b);
-                            vCards.add(vCard);
-                        } catch (FileNotFoundException e) {
-                            e.printStackTrace();
-                            Log.e("RequestContacts", e.getMessage());
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            Log.e("RequestContacts", e.getMessage());
-                        } finally {
-                            if (fd != null) fd.close();
-                        }
-                    } while (cursor.moveToNext());
-                    Log.e("Contacts","Size: "+vCards.size());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Log.e("RequestContacts", e.getMessage());
-                } finally {
-                    cursor.close();
-                }
-            }
-
-            NetworkPackage answer = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_TELEPHONY);
-            answer.set("contacts",vCards);
-            device.sendPackage(answer);
-
-        }
-*/
-/*
-        if (np.getBoolean("requestNumbers")) {
-
-            ArrayList<String> numbers = new ArrayList<String>();
-
-            Cursor cursor = context.getContentResolver().query(
-                    CommonDataKinds.Phone.CONTENT_URI,
-                    new String[]{
-                            CommonDataKinds.Phone.DISPLAY_NAME,
-                            CommonDataKinds.Phone.NUMBER
-                    },
-                    Contacts.HAS_PHONE_NUMBER + " > 0 ",
-                    null,
-                    null
-            );
-
-            if (cursor != null && cursor.moveToFirst()) {
-                try {
-                    do {
-                        String number = cursor.getString(cursor.getColumnIndex(CommonDataKinds.Phone.NUMBER));
-                        String name = cursor.getString(cursor.getColumnIndex(CommonDataKinds.Phone.DISPLAY_NAME));
-                        numbers.add(number);
-                    } while (cursor.moveToNext());
-                    Log.e("Numbers","Size: "+numbers.size());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Log.e("RequestContacts", e.getMessage());
-                } finally {
-                    cursor.close();
-                }
-            }
-
-            NetworkPackage answer = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_TELEPHONY);
-            answer.set("numbers",numbers);
-            device.sendPackage(answer);
-        }
-*/
-
         return true;
     }
 
     @Override
     public String[] getSupportedPackageTypes() {
         return new String[]{PACKAGE_TYPE_SMS_REQUEST, TelephonyPlugin.PACKAGE_TYPE_TELEPHONY_REQUEST};
     }
 
     @Override
     public String[] getOutgoingPackageTypes() {
         return new String[]{};
     }
 
     @Override
     public String[] getRequiredPermissions() {
-        return new String[]{Manifest.permission.SEND_SMS/*, Manifest.permission.READ_CONTACTS*/};
+        return new String[]{Manifest.permission.SEND_SMS};
     }
 }