diff --git a/qt/prefs-dialog.cc b/qt/prefs-dialog.cc
index 42c16fba8..7c73e0610 100644
--- a/qt/prefs-dialog.cc
+++ b/qt/prefs-dialog.cc
@@ -190,33 +190,6 @@ PrefsDialog :: lineEditNew( int key, int echoMode )
 ****
 ***/
 
-QWidget *
-PrefsDialog :: createTrackerTab( )
-{
-    QWidget *l, *r;
-    HIG * hig = new HIG( );
-    hig->addSectionTitle( tr( "Tracker Proxy" ) );
-    hig->addWideControl( l = checkBoxNew( tr( "Connect to tracker via a pro&xy" ), Prefs::PROXY_ENABLED ) );
-    myUnsupportedWhenRemote << l;
-    l = hig->addRow( tr( "Proxy &server:" ), r = lineEditNew( Prefs::PROXY ) );
-    myProxyWidgets << l << r;
-    l = hig->addRow( tr( "Proxy &port:" ), r = spinBoxNew( Prefs::PROXY_PORT, 1, 65535, 1 ) );
-    myProxyWidgets << l << r;
-    hig->addWideControl( l = checkBoxNew( tr( "Use &authentication" ), Prefs::PROXY_AUTH_ENABLED ) );
-    myProxyWidgets << l;
-    l = hig->addRow( tr( "&Username:" ), r = lineEditNew( Prefs::PROXY_USERNAME ) );
-    myProxyAuthWidgets << l << r;
-    l = hig->addRow( tr( "Pass&word:" ), r = lineEditNew( Prefs::PROXY_PASSWORD, QLineEdit::Password ) );
-    myProxyAuthWidgets << l << r;
-    myUnsupportedWhenRemote << myProxyAuthWidgets;
-    hig->finish( );
-    return hig;
-}
-
-/***
-****
-***/
-
 QWidget *
 PrefsDialog :: createWebTab( Session& session )
 {
@@ -650,7 +623,6 @@ PrefsDialog :: PrefsDialog( Session& session, Prefs& prefs, QWidget * parent ):
     t->addTab( createNetworkTab( ),      tr( "Network" ) );
     t->addTab( createDesktopTab( ),      tr( "Desktop" ) );
     t->addTab( createWebTab( session ),  tr( "Web" ) );
-    //t->addTab( createTrackerTab( ),    tr( "Trackers" ) );
     myLayout->addWidget( t );
 
     QDialogButtonBox * buttons = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
@@ -662,7 +634,6 @@ PrefsDialog :: PrefsDialog( Session& session, Prefs& prefs, QWidget * parent ):
 
     QList<int> keys;
     keys << Prefs :: RPC_ENABLED
-         << Prefs :: PROXY_ENABLED
          << Prefs :: ALT_SPEED_LIMIT_ENABLED
          << Prefs :: ALT_SPEED_LIMIT_TIME_ENABLED
          << Prefs :: ENCRYPTION
@@ -729,15 +700,6 @@ PrefsDialog :: refreshPref( int key )
             break;
         }
 
-        case Prefs :: PROXY_ENABLED:
-        case Prefs :: PROXY_AUTH_ENABLED: {
-            const bool enabled( myPrefs.getBool( Prefs::PROXY_ENABLED ) );
-            const bool auth( myPrefs.getBool( Prefs::PROXY_AUTH_ENABLED ) );
-            foreach( QWidget * w, myProxyAuthWidgets ) w->setEnabled( enabled && auth );
-            foreach( QWidget * w, myProxyWidgets ) w->setEnabled( enabled );
-            break;
-        }
-
         case Prefs :: ALT_SPEED_LIMIT_TIME_ENABLED: {
             const bool enabled = myPrefs.getBool( key );
             foreach( QWidget * w, mySchedWidgets ) w->setEnabled( enabled );
diff --git a/qt/prefs-dialog.h b/qt/prefs-dialog.h
index f3cbbf98f..3c74a762f 100644
--- a/qt/prefs-dialog.h
+++ b/qt/prefs-dialog.h
@@ -85,7 +85,6 @@ class PrefsDialog: public QDialog
         QWidget * createNetworkTab( );
         QWidget * createDesktopTab( );
         QWidget * createWebTab( Session& );
-        QWidget * createTrackerTab( );
 
     private:
         typedef QMap<int,QWidget*> key2widget_t;
diff --git a/qt/prefs.cc b/qt/prefs.cc
index 885ad4443..33bed31d6 100644
--- a/qt/prefs.cc
+++ b/qt/prefs.cc
@@ -102,14 +102,7 @@ Prefs::PrefItem Prefs::myItems[] =
     { DHT_ENABLED, TR_PREFS_KEY_DHT_ENABLED, QVariant::Bool },
     { LPD_ENABLED, TR_PREFS_KEY_LPD_ENABLED, QVariant::Bool },
     { PORT_FORWARDING, TR_PREFS_KEY_PORT_FORWARDING, QVariant::Bool },
-    { PROXY_AUTH_ENABLED, TR_PREFS_KEY_PROXY_AUTH_ENABLED, QVariant::Bool },
     { PREALLOCATION, TR_PREFS_KEY_PREALLOCATION, QVariant::Int },
-    { PROXY_ENABLED, TR_PREFS_KEY_PROXY_ENABLED, QVariant::Bool },
-    { PROXY_PASSWORD, TR_PREFS_KEY_PROXY_PASSWORD, QVariant::String },
-    { PROXY_PORT, TR_PREFS_KEY_PROXY_PORT, QVariant::Int },
-    { PROXY, TR_PREFS_KEY_PROXY, QVariant::String },
-    { PROXY_TYPE, TR_PREFS_KEY_PROXY_TYPE, QVariant::Int },
-    { PROXY_USERNAME, TR_PREFS_KEY_PROXY_USERNAME, QVariant::String },
     { RATIO, TR_PREFS_KEY_RATIO, QVariant::Double },
     { RATIO_ENABLED, TR_PREFS_KEY_RATIO_ENABLED, QVariant::Bool },
     { RENAME_PARTIAL_FILES, TR_PREFS_KEY_RENAME_PARTIAL_FILES, QVariant::Bool },
diff --git a/qt/prefs.h b/qt/prefs.h
index 6d97410c0..6ef11b9b7 100644
--- a/qt/prefs.h
+++ b/qt/prefs.h
@@ -107,14 +107,7 @@ class Prefs: public QObject
             DHT_ENABLED,
             LPD_ENABLED,
             PORT_FORWARDING,
-            PROXY_AUTH_ENABLED,
             PREALLOCATION,
-            PROXY_ENABLED,
-            PROXY_PASSWORD,
-            PROXY_PORT,
-            PROXY,
-            PROXY_TYPE,
-            PROXY_USERNAME,
             RATIO,
             RATIO_ENABLED,
             RENAME_PARTIAL_FILES,