diff --git a/src/im/InformationManagerDriver.cc b/src/im/InformationManagerDriver.cc
index f647c4ea10..e10096f606 100644
--- a/src/im/InformationManagerDriver.cc
+++ b/src/im/InformationManagerDriver.cc
@@ -164,8 +164,6 @@ void InformationManagerDriver::protocol(
 
             if (rc == 0)
             {
-                // TODO: update last_poll   vm->set_last_poll
-
                 monitor_str = vatt->vector_value("POLL");
 
                 VirtualMachineManagerDriver::process_poll(vmid, monitor_str);
diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index b3bd9e0bd7..3b1d8f44c2 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -1338,8 +1338,6 @@ void VirtualMachineManager::poll_action(
         "",
         vm->to_xml(vm_tmpl));
 
-    vm->set_last_poll(time(0));
-
     vmd->poll(vid, *drv_msg);
 
     delete drv_msg;
@@ -1479,8 +1477,6 @@ void VirtualMachineManager::timer_action()
         os << "Monitoring VM " << *it << ".";
         NebulaLog::log("VMM", Log::INFO, os);
 
-        vm->set_last_poll(thetime);
-
         vmd = get(vm->get_vmm_mad());
 
         if ( vmd == 0 )
@@ -1506,8 +1502,6 @@ void VirtualMachineManager::timer_action()
 
         delete drv_msg;
 
-        vmpool->update(vm);
-
         vm->unlock();
     }
 }
diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc
index 290589346d..16b85b36cc 100644
--- a/src/vmm/VirtualMachineManagerDriver.cc
+++ b/src/vmm/VirtualMachineManagerDriver.cc
@@ -540,6 +540,8 @@ void VirtualMachineManagerDriver::process_poll(
         return;
     }
 
+    vm->set_last_poll(time(0));
+
     vm->update_info(memory,cpu,net_tx,net_rx);
     vm->set_vm_info();