diff --git a/src/storage/models/device.py b/src/storage/models/device.py
deleted file mode 100644
index 2de30fa..0000000
--- a/src/storage/models/device.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from .base_model import BaseModel
-from peewee import CharField, DateTimeField, ForeignKeyField, BooleanField
-
-
-class Device(BaseModel):
-    friendly_name = CharField(max_length=200)
-
-
-class Feature(BaseModel):
-    friendly_name = CharField(max_length=200)
-    device = ForeignKeyField(Device, backref="sensors")
-    type = CharField(max_length=150)
-    is_sensor = BooleanField()
diff --git a/src/storage/models/logs.py b/src/storage/models/logs.py
index b60f701..8a9d971 100644
--- a/src/storage/models/logs.py
+++ b/src/storage/models/logs.py
@@ -1,11 +1,12 @@
 from .base_model import BaseModel
-from .device import Feature
-from peewee import DateTimeField, ForeignKeyField, DecimalField, BooleanField
+from peewee import DateTimeField, ForeignKeyField, DecimalField, CharField
 
 
 class StateLog(BaseModel):
     timestamp = DateTimeField()
-    feature = ForeignKeyField(Feature, backref="values")
+    property = CharField(max_length=200, index=True)
+    device_id = CharField(max_length=200, index=True)
+    device_name = CharField(max_length=200, index=True)
     char_value = DecimalField(5, 2, auto_round=True)
     numeric_value = DecimalField(12, 3, auto_round=True)
     previous_state = ForeignKeyField("StateLog")