diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
index 7609fcb4ba6aef1f4f8da737392a87c1f34dd7d3..cbdc75047ec76bbfbc9ede344275af17b29ba89f 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
@@ -16,7 +16,6 @@ import android.view.MenuInflater;
 
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.Toast;
 
 import java.util.ArrayList;
@@ -51,7 +50,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         getWindow().addFlags(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
         setContentView(R.layout.activity_main);
         this.findViewById(R.id.mainLayout).setOnKeyListener(this);
@@ -152,9 +151,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 });
                 this.barcodeLearnDialog.show();
                 break;
-            case R.id.action_exit:
-                    finish();
-                break;
             default:
                 break;
         }
@@ -208,33 +204,4 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         // nothing to do here
         // … really
     }
-/*
-
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (event.getAction()==KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
-           if(this.atxvAdapter.getCount() == 1) {
-               setCurrentUser(SQLiteService.getInstance().remoteGetUser(((User) this.atxvAdapter.getItem(0)).getUserid()));
-               this.atxvName.setText(this.atxvAdapter.getItem(0).toString());
-               this.atxvName.dismissDropDown();
-           }
-           return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        setCurrentUser(SQLiteService.getInstance().remoteGetUser(((User) this.atxvAdapter.getItem(position)).getUserid()));
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        this.currentUser.setCredit(this.currentUser.getCredit() - this.getTotal());
-        this.currentUser.save();
-        RestClient.getInstance().saveUserCredit(this.currentUser);
-        this.clearCurrentUser();
-    }
-
-*/
 }
diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
index 1da43024e659e9e07cf68f73109ca158229681eb..97247957bb2ee185c58d35881060f4bca046b6b1 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
@@ -70,7 +70,7 @@ public class MainManager {
     private RestService createRestService() {
 
         Retrofit.Builder builder = new Retrofit.Builder()
-                .baseUrl("https://infra-test.warpzone/api/")
+                .baseUrl("https://infra.warpzone/api/")
         .addConverterFactory(GsonConverterFactory.create());