--- a/src/com/beem/project/beem/service/BeemChatManager.java	Fri Dec 18 21:47:50 2009 +0100
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Fri Dec 18 21:53:02 2009 +0100
@@ -51,7 +51,6 @@
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.ChatManager;
 import org.jivesoftware.smack.ChatManagerListener;
-import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.util.StringUtils;
 
 import android.app.Notification;

--- a/src/com/beem/project/beem/service/ChatAdapter.java	Fri Dec 18 21:47:50 2009 +0100
+++ b/src/com/beem/project/beem/service/ChatAdapter.java	Fri Dec 18 21:53:02 2009 +0100
@@ -195,6 +195,9 @@
 	mMessages.add(msg);
     }
 
+    /**
+     * Listener.
+     */
     private class MsgListener implements MessageListener, ChatStateListener {
 	@Override
 	public void processMessage(Chat chat, org.jivesoftware.smack.packet.Message message) {

--- a/src/com/beem/project/beem/ui/Chat.java	Fri Dec 18 21:47:50 2009 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Fri Dec 18 21:53:02 2009 +0100
@@ -84,7 +84,6 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.beem.project.beem.BeemService;
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.Contact;
 import com.beem.project.beem.service.Message;
@@ -92,7 +91,6 @@
 import com.beem.project.beem.service.aidl.IBeemRosterListener;
 import com.beem.project.beem.service.aidl.IChat;
 import com.beem.project.beem.service.aidl.IChatManager;
-import com.beem.project.beem.service.aidl.IChatManagerListener;
 import com.beem.project.beem.service.aidl.IMessageListener;
 import com.beem.project.beem.service.aidl.IRoster;
 import com.beem.project.beem.service.aidl.IXmppFacade;

--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Dec 18 21:47:50 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Dec 18 21:53:02 2009 +0100
@@ -76,8 +76,8 @@
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Gallery;
-import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.ListView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.graphics.drawable.BitmapDrawable;