--- src/Makefile.am	(revision 24)
+++ src/Makefile.am	(working copy)
@@ -19,10 +19,7 @@
 	Nfc.cpp Nfc.h Utils.h \
 	gtk/Consts.cpp gtk/Consts.h \
 	gtk/GtkUtil.h gtk/GtkUtil.cpp \
-	gtk/dialogs/ErrorDialog.cpp gtk/dialogs/ErrorDialog.h \
-	gtk/dialogs/KeysChooserDialog.cpp gtk/dialogs/KeysChooserDialog.h \
-	gtk/dialogs/KeysStoreDialog.cpp gtk/dialogs/KeysStoreDialog.h \
-	gtk/dialogs/InputDialog.cpp gtk/dialogs/InputDialog.h
+	gtk/dialogs/ErrorDialog.cpp gtk/dialogs/ErrorDialog.h
 	
 
 mtools_LDFLAGS = -lboost_regex-mt -lboost_thread-mt
--- src/Nfc.h	(revision 24)
+++ src/Nfc.h	(working copy)
@@ -16,9 +16,6 @@
 
 #include <glibmm/i18n.h>
 
-#include <thread/Runnable.h>
-#include <thread/AsyncCallback.h>
-
 /**
  * This class is c++ wrapper for libfreefare library.
  */
--- src/gtk/Callbacks.cpp	(revision 24)
+++ src/gtk/Callbacks.cpp	(working copy)
@@ -66,10 +66,6 @@
 	app->getBuilder()->get_widget("miSearch", pMiSearch);
 	pMiSearch->signal_activate().connect(sigc::mem_fun(*this, &Callbacks::onBtnSearchClicked));
 
-	Gtk::ImageMenuItem* pMiOpenKeys;
-	app->getBuilder()->get_widget("miOpenKeys", pMiOpenKeys);
-	pMiOpenKeys->signal_activate().connect(sigc::mem_fun(*this, &Callbacks::onMiOpenKeys));
-
 	Gtk::ImageMenuItem* pMiAbout;
 	app->getBuilder()->get_widget("miAbout", pMiAbout);
 	pMiAbout->signal_activate().connect(sigc::mem_fun(*this, &Callbacks::about));
@@ -78,8 +74,6 @@
 	app->getBuilder()->get_widget("dlgAbout", pDlgAbout);
 	pDlgAbout->signal_response().connect(sigc::mem_fun(*this, &Callbacks::onDlgAboutResponse));
 
-	dlgKeysStore.signal_changed.connect(sigc::mem_fun(*this, &Callbacks::onKeysStoreChange));
-
 	nfc = new Nfc();
 }
 
@@ -260,10 +254,6 @@
 	Gtk::Main::quit();
 }
 
-void Callbacks::onMiOpenKeys() {
-	dlgKeysStore.run();
-}
-
 void Callbacks::authenticate(int sector) {
 	unsigned char key[6] = {0};
 
--- src/gtk/Callbacks.h	(revision 24)
+++ src/gtk/Callbacks.h	(working copy)
@@ -13,13 +13,10 @@
 #include "gtk/DataAccessConditions.h"
 #include "gtk/TrailerAccessConditions.h"
 
-#include "gtk/dialogs/KeysStoreDialog.h"
 #include <gtk/dialogs/ErrorDialog.h>
 #include "gtk/ComboBoxText.h"
 
 
-#include <thread/AsyncCallback.h>
-
 class Callbacks {
 public:
 	Callbacks();
@@ -59,7 +56,6 @@
 	DataAccessConditions dataAC;
 	TrailerAccessConditions trailerAC;
 
-	KeysStoreDialog dlgKeysStore;
 	void onKeysStoreChange(std::vector<std::string> v);
 
 	void onBtnSearchClicked();