diff --git a/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java
index 8e3276d..fb8edda 100644
--- a/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java
+++ b/app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java
@@ -213,7 +213,7 @@ public class CreateOrderActivity extends BaseActivity {
         this.selectedPaymentMethod = selectedPaymentMethod;
     }
 
-    public void setSelectedPaymentMethod(PaymentMethodType paymentMethodType){
+    public void setSelectedPaymentMethodForBraintree(PaymentMethodType paymentMethodType){
         String paymentMethodCode = "";
         switch (paymentMethodType){
             case PAYPAL:
diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
index 526e557..a44f13d 100644
--- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
+++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
@@ -3,9 +3,8 @@ package ch.pizzaleu.android.api;
 public class ApiConstants {
     public static final int API_READ_TIMEOUT = 30;
     public static final int API_CONNECT_TIMEOUT = 10;
-    //public static final String API_PATH = "http://www.pizzalink.ch/";
     public static final String API_PATH = "http://pizza-leu.ch/";
-    //public static final String API_PATH = "http://pizzamaxx.ch/";
+    //public static final String API_PATH = "http://pizzaleu.ddns.net/";
     public static final String APP_TYPE_ID_ANDROID = "2";
     public static final int APP_ERROR_CODE_AUTHORIZATION = 1;
 
diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 2a1c60a..f7d39ae 100644
--- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -138,7 +138,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen
         if (requestCode == REQUEST_CODE_BRAINTREE_PAYMENT) {
             if (resultCode == Activity.RESULT_OK) {
                 DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT);
-                createOrderActivity.setSelectedPaymentMethod(result.getPaymentMethodType());
+                createOrderActivity.setSelectedPaymentMethodForBraintree(result.getPaymentMethodType());
                 createBraintreePayment(result);
                 // use the result to update your UI and send the payment method nonce to your server
             } else if (resultCode == Activity.RESULT_CANCELED) {
@@ -357,30 +357,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen
                     public void onFailure(Call<ResponseObject<Boolean>> call, Throwable t) {
                         DialogHelper.hideLoadingDialog();
                         DialogHelper.showFailedDialog();
-
-
-                        /*
-                        // dummy //
-
-                        if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.UNKNOWN){
-                            DialogHelper.hideLoadingDialog();
-                            DialogHelper.showAlertDialog(BaseActivity.currentActivity, unknownPaymentMethodText);
-                        }
-                        else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.CASH ||
-                                createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){
-                            createOrder(null);
-                        }
-                        else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT) {
-                            DialogHelper.hideLoadingDialog();
-                            startDatatransPayment();
-                        }
-                        else {
-                            DialogHelper.hideLoadingDialog();
-                            startBraintreePayment();
-                        }
-                        */
-
-
                     }
                 });
     }
@@ -546,7 +522,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen
         }
         else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.CASH ||
                 createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){
-            createOrder(null);
+            createOrder(getCreateOrderParams(null));
         }
         else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.POST_FINANCE_CARD) {
             DialogHelper.hideLoadingDialog();