diff --git a/rowers/models.py b/rowers/models.py
index d73bb683..47b6d629 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3202,12 +3202,12 @@ class WorkoutForm(ModelForm):
 
 # Used for the rowing physics calculations
 class AdvancedWorkoutForm(ModelForm):
-    quick_calc = forms.BooleanField(initial=True,required=False)
-    go_service = forms.BooleanField(initial=False,required=False,label='Experimental')
+    #quick_calc = forms.BooleanField(initial=True,required=False)
+    #go_service = forms.BooleanField(initial=False,required=False,label='Experimental')
 
     class Meta:
         model = Workout
-        fields = ['boattype','weightvalue','quick_calc']
+        fields = ['boattype','weightvalue']
 
 class RowerExportForm(ModelForm):
     class Meta:
diff --git a/rowers/tasks.py b/rowers/tasks.py
index 9f31af9b..0a097d19 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -1516,19 +1516,11 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
     else:
         debug = False
 
-    if 'quick_calc' in kwargs:
-        usetable = kwargs['quick_calc']
-    else:
-        usetable = False
-
-    if 'go_service' in kwargs:
-        goservice = kwargs['go_service']
-    else:
-        goservice = False
-
     kwargs['jobid'] = job_id
 
 
+
+
     weightvalue = float(weightvalue)
 
     # check what the real file name is
@@ -1569,6 +1561,8 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
     progressurl += "/rowers/record-progress/"
     progressurl += job_id+'/'
 
+    goservice = True
+
     if goservice:
         # do something (this should return from go service)
         with grpc.insecure_channel(
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index e50c618e..eea37716 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2623,8 +2623,8 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
         form = AdvancedWorkoutForm(request.POST)
 
         if form.is_valid():
-            quick_calc = form.cleaned_data['quick_calc']
-            go_service = form.cleaned_data['go_service']
+            #quick_calc = form.cleaned_data['quick_calc']
+            #go_service = form.cleaned_data['go_service']
             boattype = form.cleaned_data['boattype']
             weightvalue = form.cleaned_data['weightvalue']
             w.boattype = boattype
@@ -2669,8 +2669,8 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
                           first_name,last_name,emailaddress,encoder.decode_hex(id),
                           ps=[r.p0,r.p1,r.p2,r.p3],
                           ratio=r.cpratio,
-                          quick_calc = quick_calc,
-                          go_service=go_service,
+                    #      quick_calc = quick_calc,
+                    #      go_service=go_service,
                           emailbounced = r.emailbounced
             )