diff --git a/src/libtomahawk/infosystem/InfoSystem.cpp b/src/libtomahawk/infosystem/InfoSystem.cpp
index 1d7a12229..48150ac32 100644
--- a/src/libtomahawk/infosystem/InfoSystem.cpp
+++ b/src/libtomahawk/infosystem/InfoSystem.cpp
@@ -108,8 +108,6 @@ InfoSystem::InfoSystem( QObject* parent )
 {
     s_instance = this;
 
-    qDebug() << Q_FUNC_INFO;
-
     m_infoSystemCacheThreadController = new InfoSystemCacheThread( this );
     m_infoSystemCacheThreadController->start( QThread::IdlePriority );
 
@@ -150,7 +148,6 @@ InfoSystem::~InfoSystem()
 void
 InfoSystem::init()
 {
-    // tDebug() << Q_FUNC_INFO;
     if ( m_inited )
         return;
 
@@ -191,7 +188,6 @@ InfoSystem::init()
 bool
 InfoSystem::getInfo( const InfoRequestData& requestData )
 {
-    //qDebug() << Q_FUNC_INFO;
     if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
     {
         init();
@@ -228,7 +224,7 @@ InfoSystem::getInfo( const QString& caller, const QVariantMap& customData, const
 bool
 InfoSystem::pushInfo( InfoPushData pushData )
 {
-    tDebug() << Q_FUNC_INFO << "type is" << pushData.type;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "type is" << pushData.type;
     if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
     {
         init();
@@ -286,7 +282,7 @@ InfoSystem::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
         return;
     }
 
-    tDebug() << Q_FUNC_INFO << plugin.data();
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << plugin.data();
     QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "addInfoPlugin", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPluginPtr, plugin ) );
 }
 
@@ -313,7 +309,7 @@ InfoSystem::removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
         return;
     }
 
-    tDebug() << Q_FUNC_INFO << plugin.data();
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << plugin.data();
     QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "removeInfoPlugin", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPluginPtr, plugin ) );
 }
 
diff --git a/src/libtomahawk/infosystem/InfoSystemCache.cpp b/src/libtomahawk/infosystem/InfoSystemCache.cpp
index 846a66351..58607ef02 100644
--- a/src/libtomahawk/infosystem/InfoSystemCache.cpp
+++ b/src/libtomahawk/infosystem/InfoSystemCache.cpp
@@ -192,7 +192,6 @@ InfoSystemCache::notInCache( QObject *receiver, Tomahawk::InfoSystem::InfoString
 void
 InfoSystemCache::updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output )
 {
-    //qDebug() << Q_FUNC_INFO;
     const QString criteriaHashVal = criteriaMd5( criteria );
     const QString criteriaHashValWithType = criteriaMd5( criteria, type );
     const QString cacheDir = m_cacheBaseDir + QString::number( (int)type );
diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp
index 3ca764bfb..e132be95d 100644
--- a/src/libtomahawk/infosystem/InfoSystemWorker.cpp
+++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp
@@ -282,7 +282,7 @@ InfoSystemWorker::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
 void
 InfoSystemWorker::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
 {
-    tDebug() << Q_FUNC_INFO << "type is " << pushData.type;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "type is " << pushData.type;
 
     if ( pushData.pushFlags != PushNoFlag )
     {
@@ -294,7 +294,7 @@ InfoSystemWorker::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
         }
     }
 
-    tDebug() << Q_FUNC_INFO << "number of matching plugins: " << m_infoPushMap[ pushData.type ].size();
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "number of matching plugins: " << m_infoPushMap[ pushData.type ].size();
 
     Q_FOREACH( InfoPluginPtr ptr, m_infoPushMap[ pushData.type ] )
     {
@@ -307,7 +307,7 @@ InfoSystemWorker::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
 void
 InfoSystemWorker::getShortUrl( Tomahawk::InfoSystem::InfoPushData pushData )
 {
-    tDebug() << Q_FUNC_INFO << "type is " << pushData.type;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "type is " << pushData.type;
     if ( !pushData.infoPair.second.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
     {
         QMetaObject::invokeMethod( this, "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
@@ -344,7 +344,7 @@ InfoSystemWorker::getShortUrl( Tomahawk::InfoSystem::InfoPushData pushData )
 void
 InfoSystemWorker::shortLinkReady( QUrl longUrl, QUrl shortUrl, QVariant callbackObj )
 {
-    tDebug() << Q_FUNC_INFO << "long url = " << longUrl << ", shortUrl = " << shortUrl;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "long url = " << longUrl << ", shortUrl = " << shortUrl;
     m_shortLinksWaiting--;
     if ( !m_shortLinksWaiting )
         disconnect( GlobalActionManager::instance(), SIGNAL( shortLinkReady( QUrl, QUrl, QVariant ) ) );
@@ -364,7 +364,7 @@ InfoSystemWorker::shortLinkReady( QUrl longUrl, QUrl shortUrl, QVariant callback
         pushData.infoPair.first = flagProps;
     }
 
-    tDebug() << Q_FUNC_INFO << "pushInfoPair first is: " << pushData.infoPair.first.keys();
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "pushInfoPair first is: " << pushData.infoPair.first.keys();
 
     QMetaObject::invokeMethod( this, "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
 }
diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp
index 22cf1aa56..437e07bbc 100644
--- a/src/libtomahawk/resolvers/JSResolver.cpp
+++ b/src/libtomahawk/resolvers/JSResolver.cpp
@@ -229,7 +229,6 @@ JSResolver::init()
         QDir cryptojs( RESPATH "js/cryptojs" );
         foreach ( QString jsfile, cryptojs.entryList( jsfiles ) )
         {
-            qWarning() << Q_FUNC_INFO << ( RESPATH "js/cryptojs/" +  jsfile );
             d->engine->setScriptPath( RESPATH "js/cryptojs/" +  jsfile );
             QFile jslib(  RESPATH "js/cryptojs/" +  jsfile  );
             jslib.open( QIODevice::ReadOnly );