diff --git a/common/rpackagefilter.cc b/common/rpackagefilter.cc
index 9fc7c84e..94c9d6dc 100644
--- a/common/rpackagefilter.cc
+++ b/common/rpackagefilter.cc
@@ -807,6 +807,7 @@ bool RFilePackageFilter::addFile(string file)
      pkgs.insert(pkgs.begin(), string(str));
   }
   in.close();
+  return true;
 }
 
 bool RFilePackageFilter::filter(RPackage *pkg)
diff --git a/gtk/rgdebinstallprogress.cc b/gtk/rgdebinstallprogress.cc
index 45be6603..5ce9430b 100644
--- a/gtk/rgdebinstallprogress.cc
+++ b/gtk/rgdebinstallprogress.cc
@@ -330,7 +330,7 @@ RGDebInstallProgress::RGDebInstallProgress(RGMainWindow *main,
 					   RPackageLister *lister)
 
    : RInstallProgress(), RGGtkBuilderWindow(main, "rgdebinstall_progress"),
-     _totalActions(0), _progress(0), _sock(0), _userDialog(0)
+     _totalActions(0), _progress(0), _userDialog(0)
 
 {
    // timeout in sec until the expander is expanded 
@@ -795,11 +795,7 @@ void RGDebInstallProgress::finishUpdate()
    _config->Set("Synaptic::closeZvt", autoClose	? "true" : "false");
 
    // hide and finish
-   if(_sock != NULL) {
-      gtk_widget_destroy(_sock);
-   } else {
-      hide();
-   }
+   hide();
 }
 
 void RGDebInstallProgress::prepare(RPackageLister *lister)
diff --git a/gtk/rgdebinstallprogress.h b/gtk/rgdebinstallprogress.h
index 82aee8f0..3e6296f6 100644
--- a/gtk/rgdebinstallprogress.h
+++ b/gtk/rgdebinstallprogress.h
@@ -83,9 +83,6 @@ class RGDebInstallProgress:public RInstallProgress, public RGGtkBuilderWindow
 
    GtkWidget *_popupMenu; // Popup menu of the terminal
 
-   // if we run embedded
-   GtkWidget *_sock;
-
    bool _startCounting;
 
    RGUserDialog *_userDialog;
diff --git a/gtk/rgfetchprogress.cc b/gtk/rgfetchprogress.cc
index df92f74d..358becc2 100644
--- a/gtk/rgfetchprogress.cc
+++ b/gtk/rgfetchprogress.cc
@@ -70,7 +70,7 @@ bool RGFetchProgress::close()
 }
 
 RGFetchProgress::RGFetchProgress(RGWindow *win)
-   : RGGtkBuilderWindow(win, "fetch"), _cursorDirty(false), _sock(NULL)
+   : RGGtkBuilderWindow(win, "fetch"), _cursorDirty(false)
 {
    GtkCellRenderer *renderer;
    GtkTreeViewColumn *column;
@@ -126,9 +126,6 @@ RGFetchProgress::RGFetchProgress(RGWindow *win)
                                  "clicked",
                                  G_CALLBACK(stopDownload), this);
 
-   PangoContext *context = gdk_pango_context_get();
-   _layout = pango_layout_new(context);
-
    gtk_widget_realize(_win);
 
    // reset the urgency hint here (gtk seems to like showing it for
@@ -369,11 +366,7 @@ void RGFetchProgress::Stop()
 {
    //cout << "RGFetchProgress::Stop()" << endl;
    RGFlushInterface();
-   if(_sock != NULL) {
-      gtk_widget_destroy(_sock);
-   } else {
-      hide();
-   }
+   hide();
    pkgAcquireStatus::Stop();
 
    //FIXME: this needs to be handled in a better way (gtk-2 maybe?)
diff --git a/gtk/rgfetchprogress.h b/gtk/rgfetchprogress.h
index f1e4e1c5..4fc6eb53 100644
--- a/gtk/rgfetchprogress.h
+++ b/gtk/rgfetchprogress.h
@@ -49,9 +49,6 @@ class RGFetchProgress : public pkgAcquireStatus, public RGGtkBuilderWindow {
 
    GtkWidget *_mainProgressBar; // GtkProgressBar
 
-   GtkWidget *_sock;
-
-   PangoLayout *_layout;
    GtkTreeViewColumn *_statusColumn;
    GtkCellRenderer *_statusRenderer;
    bool _cancelled;
diff --git a/gtk/rgterminstallprogress.cc b/gtk/rgterminstallprogress.cc
index 48947fec..80dd7cb7 100644
--- a/gtk/rgterminstallprogress.cc
+++ b/gtk/rgterminstallprogress.cc
@@ -57,7 +57,7 @@ using namespace std;
 
 
 RGTermInstallProgress::RGTermInstallProgress(RGMainWindow *main) 
-   : RInstallProgress(), RGGtkBuilderWindow(main, "zvtinstallprogress"), _sock(NULL)
+   : RInstallProgress(), RGGtkBuilderWindow(main, "zvtinstallprogress")
 {
    setTitle(_("Applying Changes"));
 
@@ -173,11 +173,7 @@ void RGTermInstallProgress::stopShell(GtkWidget *self, void* data)
    } 
 
    RGFlushInterface();
-   if(me->_sock != NULL) {
-      gtk_widget_destroy(me->_sock);
-   } else {
-      me->hide();
-   }
+   me->hide();
 }
 
 bool RGTermInstallProgress::close()
@@ -186,19 +182,6 @@ bool RGTermInstallProgress::close()
    return true;
 }
 
-gboolean RGTermInstallProgress::zvtFocus (GtkWidget *widget,
-					 GdkEventButton *event,
-					 gpointer user_data)
-{
-   //cout << "zvtFocus" << endl;
-    
-   gtk_widget_grab_focus(widget);
-    
-   return FALSE;
-}
-
-
-
 
 pkgPackageManager::OrderResult 
 RGTermInstallProgress::start(pkgPackageManager *pm,
diff --git a/gtk/rgterminstallprogress.h b/gtk/rgterminstallprogress.h
index ad0e6729..8d3734b9 100644
--- a/gtk/rgterminstallprogress.h
+++ b/gtk/rgterminstallprogress.h
@@ -38,10 +38,8 @@ class RGTermInstallProgress : public RInstallProgress, public RGGtkBuilderWindow
   GtkWidget *_statusL;
   GtkWidget *_closeB;
   GtkWidget *_closeOnF;
-  GtkWidget *_sock;
 
   pkgPackageManager::OrderResult res;
-  static gboolean zvtFocus (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 
 protected:
   bool child_has_exited;