diff --git a/django/didgeridoo/webshop/admin.py b/django/didgeridoo/webshop/admin.py
index bf5d110..625d248 100644
--- a/django/didgeridoo/webshop/admin.py
+++ b/django/didgeridoo/webshop/admin.py
@@ -5,7 +5,7 @@ from django.contrib.auth.models import User
 # Register your models here.
 from webshop.models import (Article, Order, OrderPosition,
                             Person, City, Picture, OrderOfGoods,
-                            Category, Option, Setting)
+                            Category, Option)
 
 
 class PersonInline(admin.StackedInline):
@@ -58,4 +58,3 @@ admin.site.register(City)
 admin.site.register(OrderOfGoods, OrderOfGoodsAdmin)
 admin.site.register(Category)
 admin.site.register(Option)
-admin.site.register(Setting)
diff --git a/django/didgeridoo/webshop/models.py b/django/didgeridoo/webshop/models.py
index 3bb3442..3d51293 100644
--- a/django/didgeridoo/webshop/models.py
+++ b/django/didgeridoo/webshop/models.py
@@ -8,17 +8,10 @@ from django.utils import timezone
 class Option(models.Model):
     name = models.CharField(max_length=200, unique=True)
     value = models.IntegerField(default=5)
-
-    def __str__(self):
-        return self.name
-
-
-class Setting(models.Model):
-    option = models.ForeignKey(Option, on_delete=models.CASCADE)
     enabled = models.BooleanField(default=False)
 
     def __str__(self):
-        return str(self.option)
+        return self.name
 
 
 class ArticleStatus(models.Model):