diff --git a/data/images/album-shadow.png b/data/images/album-shadow.png
deleted file mode 100644
index aa609a3ba..000000000
Binary files a/data/images/album-shadow.png and /dev/null differ
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index c2a3c098b..dc9dba5da 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -181,8 +181,6 @@ TomahawkApp::init()
 
     TomahawkUtils::setProxyFactory( proxyFactory );
 
-    Echonest::Config::instance()->setAPIKey( "JRIHWEP6GPOER2QQ6" );
-
     m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
     m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
     new Pipeline( this );
@@ -193,6 +191,8 @@ TomahawkApp::init()
     tDebug() << "Init Database.";
     initDatabase();
 
+    Echonest::Config::instance()->setAPIKey( "JRIHWEP6GPOER2QQ6" );
+
     tDebug() << "Init Echonest Factory.";
     GeneratorFactory::registerFactory( "echonest", new EchonestFactory );
     tDebug() << "Init Database Factory.";
@@ -223,9 +223,7 @@ TomahawkApp::init()
     tDebug() << "Init InfoSystem.";
     m_infoSystem = QWeakPointer<Tomahawk::InfoSystem::InfoSystem>( new Tomahawk::InfoSystem::InfoSystem( this ) );
 
-    Echonest::Config::instance()->setAPIKey( "JRIHWEP6GPOER2QQ6" );
     Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() );
-
     EchonestGenerator::setupCatalogs();
 
 #ifndef TOMAHAWK_HEADLESS
@@ -305,10 +303,11 @@ TomahawkApp::~TomahawkApp()
 
     delete SipHandler::instance();
 
+    Pipeline::instance()->stop();
+
     if ( !m_database.isNull() )
         delete m_database.data();
 
-    Pipeline::instance()->stop();
     delete Pipeline::instance();
 
 #ifndef TOMAHAWK_HEADLESS