diff --git a/include/transport/buddy.h b/include/transport/buddy.h
index 7bfed9a3f35c5b2d509ff2238dc621452af460ef..a22595d5277240342cf816274f3530e706640cbd 100644
--- a/include/transport/buddy.h
+++ b/include/transport/buddy.h
@@ -180,7 +180,7 @@ class Buddy {
 		bool m_online;
 		bool m_blocked;
 		std::string m_subscription;
-		Swift::Presence::ref m_lastPresence;
+// 		Swift::Presence::ref m_lastPresence;
 		Swift::JID m_jid;
 		BuddyFlag m_flags;
 		RosterManager *m_rosterManager;
diff --git a/src/buddy.cpp b/src/buddy.cpp
index b22c4d1be21d6601e938837b3bd844f4875923de..c96aa34ce981ffb6d4981637aabfb325dad6d48b 100644
--- a/src/buddy.cpp
+++ b/src/buddy.cpp
@@ -70,7 +70,7 @@ void Buddy::setOnline() {
 
 void Buddy::setOffline() {
 	m_online = false;
-	m_lastPresence = Swift::Presence::ref();
+// 	m_lastPresence = Swift::Presence::ref();
 }
 
 bool Buddy::isOnline() {
@@ -118,14 +118,14 @@ Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new)
 		}
 	}
 
-	if (only_new) {
-		if (m_lastPresence)
-			m_lastPresence->setTo(Swift::JID(""));
-		if (m_lastPresence == presence) {
-			return Swift::Presence::ref();
-		}
-		m_lastPresence = presence;
-	}
+// 	if (only_new) {
+// 		if (m_lastPresence)
+// 			m_lastPresence->setTo(Swift::JID(""));
+// 		if (m_lastPresence == presence) {
+// 			return Swift::Presence::ref();
+// 		}
+// 		m_lastPresence = presence;
+// 	}
 
 	return presence;
 }
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ae461c95701e03055e486a298499e19bb94b1865..91509686f53b96f868770b9fe35e34c2cf82b078 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -31,6 +31,7 @@
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "malloc.h"
+// #include "valgrind/memcheck.h"
 
 using namespace log4cxx;
 
@@ -94,6 +95,7 @@ void UserManager::removeUser(User *user) {
 	onUserDestroyed(user);
 	delete user;
 	malloc_trim(0);
+// 	VALGRIND_DO_LEAK_CHECK;
 }
 
 int UserManager::getUserCount() {