diff --git a/rowers/tasks.py b/rowers/tasks.py
index c2f00b7d..313f9095 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -416,19 +416,6 @@ def handle_sendemail_invite_accept(email,name,teamname,managername):
     return 1
 
 
-@app.task
-def handle_remove_workouts_team(ws,t):
-    for w in ws:
-        w.team.remove(t)
-
-    return 1
-
-@app.task
-def handle_add_workouts_team(ws,t):
-    for w in ws:
-        w.team.add(t)
-
-    return 1
 
 # Another simple task for debugging purposes
 def add2(x,y):
diff --git a/rowers/teams.py b/rowers/teams.py
index 86c6423c..eadc2dc1 100644
--- a/rowers/teams.py
+++ b/rowers/teams.py
@@ -19,8 +19,8 @@ from rowers.models import (
     )
 
 from rowers.tasks import (
-    handle_remove_workouts_team,handle_sendemail_invite,
-    handle_add_workouts_team,handle_sendemail_request,
+    handle_sendemail_invite,
+    handle_sendemail_request,
     handle_sendemail_member_dropped,handle_sendemail_request_accept,
     handle_sendemail_request_reject,handle_sendemail_invite_reject,
     handle_sendemail_invite_accept,handle_sendemail_team_removed,
@@ -30,6 +30,19 @@ from rowers.tasks import (
 
 inviteduration = 14 # days
 
+def handle_remove_workouts_team(ws,t):
+    for w in ws:
+        w.team.remove(t)
+
+    return 1
+
+def handle_add_workouts_team(ws,t):
+    
+    for w in ws:
+        w.team.add(t)
+
+    return 1
+
 def update_team(t,name,manager,private,notes):
     if t.manager != manager:
         return (0,'You are not the manager of this team')
@@ -81,11 +94,7 @@ def add_member(id,rower):
     # code to add all workouts
     ws = Workout.objects.filter(user=rower)
     
-    if settings.DEBUG:
-        res = handle_add_workouts_team(ws,t)
-    else:
-        res = queuehigh.enqueue(handle_add_workouts_team,ws,t)
-
+    res = handle_add_workouts_team(ws,t)
 
     set_teamplanexpires(rower)
         
@@ -97,10 +106,7 @@ def remove_member(id,rower):
     # remove the team from rower's workouts:
     ws = Workout.objects.filter(user=rower,team=t)
 
-    if settings.DEBUG:
-        res = handle_remove_workouts_team(ws,t)
-    else:
-        res = queuehigh.enqueue(handle_remove_workouts_team,ws,t)
+    res = handle_remove_workouts_team(ws,t)
             
     set_teamplanexpires(rower)
     return (id,'Member removed')
diff --git a/rowers/views.py b/rowers/views.py
index 3e0fa2d0..3bc5a4b6 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -2998,10 +2998,12 @@ def workout_flexchart3_view(request,*args,**kwargs):
     if row.workouttype == 'water':
         workouttype = 'otw'
 
-
-    favorites = FavoriteChart.objects.filter(user=r,
-                                             workouttype__in=[workouttype,'both']).order_by("id")
-    maxfav = len(favorites)-1
+    try:
+        favorites = FavoriteChart.objects.filter(user=r,
+                                                 workouttype__in=[workouttype,'both']).order_by("id")
+        maxfav = len(favorites)-1
+    except:
+        pass
 
     # check if favoritenr is not out of range
     if favorites: