diff --git a/.gitignore b/.gitignore
index adb35af22..d102efed3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,4 @@ obj/
 *.iml
 local.properties
 *.keystore
-
-MessengerProj/libs/
-
-
+libs/
diff --git a/MessengerProj/jni/mrwrapper.c b/MessengerProj/jni/mrwrapper.c
index 5af2813c6..929ffea56 100644
--- a/MessengerProj/jni/mrwrapper.c
+++ b/MessengerProj/jni/mrwrapper.c
@@ -428,7 +428,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrChatGetName(JNIEnv *env, j
 
 JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_MrChatGetSubtitle(JNIEnv *env, jclass c, jlong hChat)
 {
-	const char* temp = mrchat_get_subtitle((mrchat_t*)hChat); /* mrchat_get_subtitle() checks for nullpointers */
+	const char* temp = mrchat_get_subtitle((mrchat_t*)hChat);
 		jstring ret = JSTRING_NEW(temp);
 	free(temp);
 	return ret;
@@ -467,7 +467,7 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrChatGetTotalMsgCount(JNIEnv *
 
 JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_MrChatGetUnseenCount(JNIEnv *env, jclass c, jlong hChat)
 {
-	return mrchat_get_unseen_count((mrchat_t*)hChat); /* mrchat_get_unseen_count() checks for nullpointers */
+	return mrchat_get_unseen_count((mrchat_t*)hChat);
 }
 
 
@@ -549,7 +549,7 @@ JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_MrMailboxGetChatContacts(J
 
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_MrMsglistUnref(JNIEnv *env, jclass c, jlong hMsglist)
 {
-	mrmsglist_unref((mrmsglist_t*)hMsglist); /* mrmsglist_unref() checks for nullpointers */
+	mrmsglist_unref((mrmsglist_t*)hMsglist);
 }
 
 
diff --git a/MessengerProj/libs/armeabi-v7a/libmessenger.1.so b/MessengerProj/libs/armeabi-v7a/libmessenger.1.so
deleted file mode 100755
index e87e4e8e6..000000000
Binary files a/MessengerProj/libs/armeabi-v7a/libmessenger.1.so and /dev/null differ
diff --git a/MessengerProj/libs/armeabi/libmessenger.1.so b/MessengerProj/libs/armeabi/libmessenger.1.so
deleted file mode 100755
index a52100370..000000000
Binary files a/MessengerProj/libs/armeabi/libmessenger.1.so and /dev/null differ
diff --git a/MessengerProj/libs/x86/libmessenger.1.so b/MessengerProj/libs/x86/libmessenger.1.so
deleted file mode 100755
index b0e9486d4..000000000
Binary files a/MessengerProj/libs/x86/libmessenger.1.so and /dev/null differ
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java
index 883b53be1..62a711608 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java
@@ -21,7 +21,7 @@
  *
  * File:    MrMailbox.java
  * Authors: Björn Petersen
- * Purpose: The Java part of the Java<->C Wrapper, see also mr_wrapper.c
+ * Purpose: The Java part of the Java<->C Wrapper, see also mrwrapper.c
  *
  ******************************************************************************/