diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 6f1d5bd66..173a9f80e 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -52,7 +52,15 @@ Application::Application(int argc, char **argv) :
 
 Application::~Application()
 {
+    qDebug() << "* Mirall shutdown";
     INotify::cleanup();
+
+    delete _networkMgr;
+    delete _tray;
+
+    foreach (Folder *folder, _folderMap) {
+        delete folder;
+    }
 }
 
 QString Application::folderConfigPath() const
diff --git a/src/mirall/inotify.cpp b/src/mirall/inotify.cpp
index f47e39857..c0f5ee4f3 100644
--- a/src/mirall/inotify.cpp
+++ b/src/mirall/inotify.cpp
@@ -11,7 +11,6 @@ http://www.gnu.org/licenses/gpl.txt .
 #include <cerrno>
 #include <unistd.h>
 #include <QDebug>
-#include <QMutexLocker>
 #include <QStringList>
 
 #include "inotify.h"
@@ -25,7 +24,6 @@ namespace Mirall {
 // Allocate space for static members of class.
 int INotify::s_fd;
 INotify::INotifyThread* INotify::s_thread;
-QMutex INotify::INotifyThread::s_mutex;
 
 //INotify::INotify(int wd) : _wd(wd)
 //{
@@ -48,7 +46,6 @@ INotify::~INotify()
 
 void INotify::addPath(const QString &path)
 {
-    //QMutexLocker locker(&INotifyThread::s_mutex);
     // Add an inotify watch.
     path.toAscii().constData();
 
@@ -61,7 +58,6 @@ void INotify::addPath(const QString &path)
 
 void INotify::removePath(const QString &path)
 {
-    QMutexLocker locker(&INotifyThread::s_mutex);
     // Remove the inotify watch.
     inotify_rm_watch(s_fd, _wds[path]);
     _wds.remove(path);
@@ -76,8 +72,7 @@ void
 INotify::INotifyThread::unregisterForNotification(INotify* notifier)
 {
     //_map.remove(notifier->_wd);
-    //QMutexLocker locker(&INotifyThread::s_mutex);
-    QHash<int, INotify*>::iterator it;
+    QMap<int, INotify*>::iterator it;
     for (it = _map.begin(); it != _map.end(); ++it) {
         if (it.value() == notifier)
             _map.remove(it.key());
@@ -87,7 +82,6 @@ INotify::INotifyThread::unregisterForNotification(INotify* notifier)
 void
 INotify::INotifyThread::registerForNotification(INotify* notifier, int wd)
 {
-    //QMutexLocker locker(&INotifyThread::s_mutex);
     _map[wd] = notifier;
 }
 
@@ -95,8 +89,6 @@ void
 INotify::fireEvent(int mask, int cookie, int wd, char* name)
 {
     //qDebug() << "****" << name;
-    //QMutexLocker locker(&INotifyThread::s_mutex);
-
     QStringList paths(_wds.keys(wd));
     foreach (QString path, paths)
         emit notifyEvent(mask, cookie, path + "/" + QString::fromUtf8(name));
@@ -179,25 +171,16 @@ INotify::INotifyThread::run()
                 continue;
             }
             n = _map[event->wd];
-            // dont allow addPath removePath clash here
-            {
-                //QThread::msleep(100);
-                // fire event
-                if (event->len > 0) {
-                    //QMutexLocker locker(&s_mutex);
-                    if (n)
-                        n->fireEvent(event->mask, event->cookie, event->wd, event->name);
-                    else
-                    {
-                        qWarning() << "n is NULL";
-                    }
-
-                }
+            // fire event
+            if (event->len > 0) {
+                if (n)
+                    n->fireEvent(event->mask, event->cookie, event->wd, event->name);
+                else
+                    qWarning() << "n is NULL";
 
                 // increment counter
                 i += sizeof(struct inotify_event) + event->len;
             }
-
         }
     }
 }
diff --git a/src/mirall/inotify.h b/src/mirall/inotify.h
index 22697f116..b8a1538c0 100644
--- a/src/mirall/inotify.h
+++ b/src/mirall/inotify.h
@@ -12,7 +12,6 @@ http://www.gnu.org/licenses/gpl.txt .
 
 #include <QObject>
 #include <QMap>
-#include <QMutex>
 #include <QString>
 #include <QThread>
 
@@ -43,7 +42,7 @@ private:
     class INotifyThread : public QThread
     {
         int _fd;
-        QHash<int, INotify*> _map;
+        QMap<int, INotify*> _map;
     public:
         INotifyThread(int fd);
         ~INotifyThread();
@@ -51,7 +50,6 @@ private:
         void unregisterForNotification(INotify*);
         // fireEvent happens from the inotify thread
         // but addPath comes from the main thread
-        static QMutex s_mutex;
     protected:
         void run();
     private: