diff --git a/djangoldp_polls/migrations/0025_auto_20200508_1353.py b/djangoldp_polls/migrations/0025_auto_20200508_1353.py
new file mode 100644
index 0000000000000000000000000000000000000000..74af56e521742d7b7309061867f76b2f9fd7bbcf
--- /dev/null
+++ b/djangoldp_polls/migrations/0025_auto_20200508_1353.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2020-05-08 13:53
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djangoldp_polls', '0024_auto_20200423_1959'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='debate',
+            name='author',
+        ),
+        migrations.RemoveField(
+            model_name='poll',
+            name='debate',
+        ),
+        migrations.AlterField(
+            model_name='vote',
+            name='chosenOption',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='userVote', to='djangoldp_polls.PollOption'),
+        ),
+        migrations.AlterField(
+            model_name='vote',
+            name='relatedPoll',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='votes', to='djangoldp_polls.Poll'),
+        ),
+        migrations.DeleteModel(
+            name='Debate',
+        ),
+    ]
diff --git a/djangoldp_polls/models.py b/djangoldp_polls/models.py
index ea019564e37b197afca20ded00197dec9866726a..007df40256124fcf1559f357b9aa575ca82daa96 100644
--- a/djangoldp_polls/models.py
+++ b/djangoldp_polls/models.py
@@ -39,7 +39,7 @@ class PollOption (Model):
 
     def __str__(self):
         return self.name
-        
+
 class Poll (Model):
     created_at = models.DateTimeField(auto_now_add=True)
     author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='createdVotes', null=True,blank=True)
@@ -51,12 +51,12 @@ class Poll (Model):
     longDescription = models.TextField(verbose_name="Long description")
     tags = models.ManyToManyField(Tag, related_name='tags', blank=True)
     pollOptions = models.ManyToManyField(PollOption, related_name='pollOptions', blank=True)
-    debate = models.ManyToManyField(Debate, related_name='debate', blank=True)
+    #debate = models.ManyToManyField(Debate, related_name='debate', blank=True)
     #relatedVotes = models.ManyToManyField(Vote, related_name='relatedVotes', blank=True)
 
     class Meta : 
-        serializer_fields = ['@id','created_at','votes','debate','author','title','image','hostingOrganisation','endDate','shortDescription','longDescription','tags']
-        nested_fields = ['tags','debate','votes']
+        serializer_fields = ['@id','created_at','votes','author','title','image','hostingOrganisation','endDate','shortDescription','longDescription','tags']
+        nested_fields = ['tags','votes']
         anonymous_perms = ['view','add','change']
         authenticated_perms = ['inherit','add']
 
diff --git a/djangoldp_polls/views.py b/djangoldp_polls/views.py
index 027c4b08eea178107737a766ee6e709be331f30a..52025150fa4fdaf9f8a0f7ffecd16ee6ac3168f7 100644
--- a/djangoldp_polls/views.py
+++ b/djangoldp_polls/views.py
@@ -21,7 +21,7 @@ class TotalVotes(APIView) :
 		#calcute the number of votes per choice
 		for choice in vote.chosenOption.userVote.all():
 			#get the number of voter per option and count them
-		     total_votes = votes.filter(pollOptions=choice).count()
+		     total_votes = votes.filter(name=choice).count()
 		     choices.append((choice.name, total_votes))
 		# return response with choices in content