diff --git a/debian/copyright b/debian/copyright
index 4a11ca5b0..20b52f2e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,20 @@ Copyright:
 
 License:
 
-    GPLv3
+    All original Clementine source code is under GPL-3.
+    Code from Amarok is under GPL-2.  This includes:
+      src/xine-{engine,scope}.{h,cpp}
+      src/enginebase.{h,cpp}
+      src/engine_fwd.h
+      src/sliderwidget.{h,cpp}
+      src/analyzers/analyzerbase.{h,cpp}
+      src/analyzers/{bar,block,boom}analyzer.{h,cpp}
+      src/analyzers/sonogram.{h,cpp}
+      src/analyzers/glanalyzer*.{h,cpp}
+    googlemock and googletest (3rdparty/gmock) are under APL-2
+    qsqlite is (3rdparty/qsqlite) is under LGPL-2.1
+    qtsingleapplication (3rdparty/qtsingleapplication) is under LGPL-2.1
+    qxt (3rdparty/qxt) is under LGPL-2.1
 
 The Debian packaging is:
 
diff --git a/src/analyzers/analyzerfactory.cpp b/src/analyzers/analyzerfactory.cpp
deleted file mode 100644
index 91c28b013..000000000
--- a/src/analyzers/analyzerfactory.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************
-                        analyzerfactory.cpp  -  description
-                           -------------------
-  begin                : Fre Nov 15 2002
-  copyright            : (C) 2002 by Mark Kretschmann
-  email                : markey@web.de
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <config.h> //for HAVE_QGLWIDGET macro
-
-#include "amarokcore/amarokconfig.h"
-#include "analyzerbase.h" //declaration here
-
-#include "baranalyzer.h"
-#include "boomanalyzer.h"
-#include "sonogram.h"
-#include "turbine.h"
-#include "blockanalyzer.h"
-
-#ifdef HAVE_QGLWIDGET
-#include "glanalyzer.h"
-#include "glanalyzer2.h"
-#include "glanalyzer3.h"
-#endif
-
-#include <qlabel.h>
-#include <klocale.h>
-
-//separate from analyzerbase.cpp to save compile time
-
-
-QWidget *Analyzer::Factory::createAnalyzer( QWidget *parent )
-{
-    //new XmmsWrapper(); //toplevel
-
-    QWidget *analyzer = 0;
-
-    switch( AmarokConfig::currentAnalyzer() )
-    {
-    case 2:
-        analyzer = new Sonogram( parent );
-        break;
-    case 1:
-        analyzer = new TurbineAnalyzer( parent );
-        break;
-    case 3:
-        analyzer = new BarAnalyzer( parent );
-        break;
-    case 4:
-        analyzer = new BlockAnalyzer( parent );
-        break;
-#ifdef HAVE_QGLWIDGET
-    case 5:
-        analyzer = new GLAnalyzer( parent );
-        break;
-    case 6:
-        analyzer = new GLAnalyzer2( parent );
-        break;
-    case 7:
-        analyzer = new GLAnalyzer3( parent );
-        break;
-    case 8:
-#else
-    case 5:
-#endif
-        analyzer = new QLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
-        static_cast<QLabel *>(analyzer)->setAlignment( Qt::AlignCenter );
-    break;
-
-    default:
-        AmarokConfig::setCurrentAnalyzer( 0 );
-    case 0:
-        analyzer = new BoomAnalyzer( parent );
-    }
-
-    return analyzer;
-}
-
-QWidget *Analyzer::Factory::createPlaylistAnalyzer( QWidget *parent)
-{
-    QWidget *analyzer = 0;
-    switch( AmarokConfig::currentPlaylistAnalyzer() )
-    {
-        case 1:
-            analyzer = new TurbineAnalyzer( parent );
-            break;
-        case 2:
-            analyzer = new Sonogram( parent );
-            break;
-        case 3:
-            analyzer = new BoomAnalyzer( parent );
-            break;
-    #ifdef HAVE_QGLWIDGET
-        case 4:
-            analyzer = new GLAnalyzer( parent );
-            break;
-        case 5:
-            analyzer = new GLAnalyzer2( parent );
-            break;
-        case 6:
-            analyzer = new GLAnalyzer3( parent );
-            break;
-        case 7:
-    #else
-        case 4:
-    #endif
-            analyzer = new QLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
-            static_cast<QLabel *>(analyzer)->setAlignment( Qt::AlignCenter );
-            break;
-
-        default:
-            AmarokConfig::setCurrentPlaylistAnalyzer( 0 );
-        case 0:
-            analyzer = new BlockAnalyzer( parent );
-            break;
-    }
-    return analyzer;
-}