diff --git a/hal.db b/hal.db
index 51a9040d..c0dbc7cd 100755
Binary files a/hal.db and b/hal.db differ
diff --git a/src/se/koc/hal/HALClient.java b/src/se/koc/hal/HALClient.java
index d8336160..79fade1a 100755
--- a/src/se/koc/hal/HALClient.java
+++ b/src/se/koc/hal/HALClient.java
@@ -8,14 +8,10 @@ import se.koc.hal.plugin.tellstick.TellstickProtocol;
 import se.koc.hal.plugin.tellstick.TellstickSerialComm;
 import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning;
 import se.koc.hal.struct.Switch;
-import se.koc.hal.stt.GoogleSTTClient;
 import se.koc.hal.intf.HalSpeachToText;
 import se.koc.hal.stt.ManualSTTClient;
-import se.koc.hal.stt.Sphinx4STTClient;
 import se.koc.hal.tts.MaryRemoteTTSClient;
-import zutil.log.LogUtil;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
index 74afb573..ffb3e165 100755
--- a/src/se/koc/hal/PowerChallenge.java
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -7,7 +7,6 @@ import se.koc.hal.deamon.HalDaemon;
 import se.koc.hal.page.PCConfigureHttpPage;
 import se.koc.hal.page.PCHeatMapHttpPage;
 import se.koc.hal.page.PCOverviewHttpPage;
-import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;
diff --git a/src/se/koc/hal/deamon/DataAggregatorDaemon.java b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
index c9f10f99..f5b1bac3 100755
--- a/src/se/koc/hal/deamon/DataAggregatorDaemon.java
+++ b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
@@ -3,7 +3,6 @@ package se.koc.hal.deamon;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
@@ -38,26 +37,17 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
     @Override
     public void run(){
     	try {
-			List<Integer> sensorIdList = HalContext.db.exec("SELECT id FROM sensor", new SQLResultHandler<List<Integer>>(){
-				@Override
-				public List<Integer> handleQueryResult(Statement stmt, ResultSet result) throws SQLException {
-					ArrayList<Integer> list = new ArrayList<>();
-					while(result.next()){
-						list.add(result.getInt("id"));
-					}
-					return list;
-				}
-			});
-			for(int id : sensorIdList){
-				logger.fine("Aggregating sensor_id: " + id);
-				aggregateSensor(id);
+			List<Sensor> sensorList = Sensor.getLocalSensors(HalContext.db);
+			for(Sensor sensor : sensorList){
+				logger.fine("Aggregating sensor_id: " + sensor.getId());
+				aggregateSensor(sensor.getId());
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
     }
 
-    public void aggregateSensor(int sensorId) {
+    public void aggregateSensor(long sensorId) {
     	DBConnection db = HalContext.db;
     	try {
     		Long maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId, new SimpleSQLHandler<Long>());
diff --git a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
index 99b7fd18..45b9e21f 100644
--- a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
+++ b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
@@ -9,7 +9,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Timer;
 import java.util.logging.Logger;