--- a/src/com/beem/project/beem/service/aidl/IBeemRosterListener.aidl	Tue Nov 15 02:29:48 2011 +0100
+++ b/src/com/beem/project/beem/service/aidl/IBeemRosterListener.aidl	Mon Nov 21 23:50:14 2011 +0100
@@ -43,11 +43,8 @@
 */
 package com.beem.project.beem.service.aidl;
 
-//import com.beem.project.beem.service.PresenceAdapter;
-
 interface IBeemRosterListener {
     void onEntriesAdded(in List<String> addresses);
     void onEntriesUpdated(in List<String> addresses);
     void onEntriesDeleted(in List<String> addresses);
-    //void onPresenceChanged(in PresenceAdapter presence);
 }

--- a/src/com/beem/project/beem/ui/Settings.java	Tue Nov 15 02:29:48 2011 +0100
+++ b/src/com/beem/project/beem/ui/Settings.java	Mon Nov 21 23:50:14 2011 +0100
@@ -44,12 +44,10 @@
 package com.beem.project.beem.ui;
 
 import android.accounts.Account;
-import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -61,12 +59,6 @@
  */
 public class Settings extends PreferenceActivity {
 
-    private static final Intent SERVICE_INTENT = new Intent();
-
-    static {
-	SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
-    }
-
     /**
      * Constructor.
      */