diff --git a/index.js b/index.js
index 1b84271..2c635e4 100644
--- a/index.js
+++ b/index.js
@@ -7,8 +7,6 @@ if (config.yahoomessenger.keepalive_interval == null) {
 
 var strftime = require('strftime');
 
-var pollingTimer;
-
 var loggedPM = [];
 
 var logger = require('winston');
@@ -35,11 +33,16 @@ function broadcast(destinations, message) {
     }
 }
 
-var keepAliveLoop = function() {
+var _keepAliveLoop = function() {
     logger.info('Keep alive loop');
 
     YahooMessenger.keepAlive();
-    pollingTimer = setTimeout(keepAliveLoop, config.yahoomessenger.keepalive_interval * 1000);
+    keepAliveLoop();
+
+}
+
+function keepAliveLoop() {
+    setTimeout(_keepAliveLoop, config.yahoomessenger.keepalive_interval * 1000);
 }
 
 function insertMessages(db_connection, logger_id, direction, partner, message, sentdate) {
@@ -97,8 +100,6 @@ function onYmPM(data) {
         loggedPM = loggedPM.slice(0, 10);
     }
 
-    lastDataOnPM = data;
-
     direction = 'IN';
 
     partner = data.sender;