diff --git a/src/zabapgit_definitions.prog.abap b/src/zabapgit_definitions.prog.abap
index 7946170e1..b9aad9d04 100644
--- a/src/zabapgit_definitions.prog.abap
+++ b/src/zabapgit_definitions.prog.abap
@@ -227,7 +227,6 @@ CONSTANTS: BEGIN OF gc_action,
              go_debuginfo           TYPE string VALUE 'go_debuginfo',
              go_settings            TYPE string VALUE 'go_settings',
              go_tutorial            TYPE string VALUE 'go_tutorial',
-             go_manage_files        TYPE string VALUE 'go_manage_files',
 
              jump                   TYPE string VALUE 'jump',
              jump_pkg               TYPE string VALUE 'jump_pkg',
diff --git a/src/zabapgit_gui_router.prog.abap b/src/zabapgit_gui_router.prog.abap
index bd03347aa..7b76f5410 100644
--- a/src/zabapgit_gui_router.prog.abap
+++ b/src/zabapgit_gui_router.prog.abap
@@ -36,7 +36,6 @@ CLASS lcl_gui_router DEFINITION FINAL.
 
     METHODS get_page_stage
       IMPORTING iv_key          TYPE lcl_persistence_repo=>ty_repo-key
-                iv_manage_files TYPE abap_bool DEFAULT abap_false
       RETURNING VALUE(ri_page)  TYPE REF TO lif_gui_page
       RAISING   lcx_exception.
 
@@ -91,9 +90,6 @@ CLASS lcl_gui_router IMPLEMENTATION.
       WHEN gc_action-go_stage.                        " Go Staging page
         ei_page  = get_page_stage( lv_key ).
         ev_state = gc_event_state-new_page_w_bookmark.
-      WHEN gc_action-go_manage_files.                 " Go files management
-        ei_page  = get_page_stage( iv_key = lv_key iv_manage_files = abap_true ).
-        ev_state = gc_event_state-new_page_w_bookmark.
       WHEN gc_action-go_branch_overview.              " Go repo branch overview
         ei_page  = get_page_branch_overview( iv_getdata ).
         ev_state = gc_event_state-new_page.
@@ -314,8 +310,7 @@ CLASS lcl_gui_router IMPLEMENTATION.
 
     CREATE OBJECT lo_stage_page
       EXPORTING
-        io_repo         = lo_repo
-        iv_manage_files = iv_manage_files.
+        io_repo         = lo_repo.
 
     ri_page = lo_stage_page.
 
diff --git a/src/zabapgit_page_stage.prog.abap b/src/zabapgit_page_stage.prog.abap
index 6f80ad850..c2cb8ff19 100644
--- a/src/zabapgit_page_stage.prog.abap
+++ b/src/zabapgit_page_stage.prog.abap
@@ -14,7 +14,6 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
       constructor
         IMPORTING
           io_repo         TYPE REF TO lcl_repo_online
-          iv_manage_files TYPE abap_bool DEFAULT abap_false
         RAISING   lcx_exception,
       lif_gui_page~on_event REDEFINITION.
 
@@ -53,13 +52,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
     ms_control-page_title = 'STAGE'.
     mo_repo = io_repo.
 
-    IF iv_manage_files = abap_true.
-      ms_files = lcl_stage_logic=>get(
-        io_repo        = mo_repo
-        iv_remote_only = abap_true ).
-    ELSE.
-      ms_files = lcl_stage_logic=>get( mo_repo ).
-    ENDIF.
+    ms_files = lcl_stage_logic=>get( mo_repo ).
 
     CREATE OBJECT mo_stage
       EXPORTING
diff --git a/src/zabapgit_stage_logic.prog.abap b/src/zabapgit_stage_logic.prog.abap
index 305e2536a..44a3bec0f 100644
--- a/src/zabapgit_stage_logic.prog.abap
+++ b/src/zabapgit_stage_logic.prog.abap
@@ -10,7 +10,6 @@ CLASS lcl_stage_logic DEFINITION FINAL.
     CLASS-METHODS:
       get
         IMPORTING io_repo         TYPE REF TO lcl_repo_online
-                  iv_remote_only  TYPE abap_bool DEFAULT abap_false
         RETURNING VALUE(rs_files) TYPE ty_stage_files
         RAISING   lcx_exception,
       count
@@ -32,13 +31,9 @@ CLASS lcl_stage_logic IMPLEMENTATION.
 
   METHOD get.
 
+    rs_files-local  = io_repo->get_files_local( ).
     rs_files-remote = io_repo->get_files_remote( ).
-
-    IF iv_remote_only = abap_false.
-      rs_files-local  = io_repo->get_files_local( ).
-      remove_identical( CHANGING cs_files = rs_files ).
-    ENDIF.
-
+    remove_identical( CHANGING cs_files = rs_files ).
     remove_ignored( EXPORTING io_repo  = io_repo
                     CHANGING  cs_files = rs_files ).
 
diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap
index 3aff5e3a8..aeaffd8d8 100644
--- a/src/zabapgit_view_repo.prog.abap
+++ b/src/zabapgit_view_repo.prog.abap
@@ -260,8 +260,8 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
       lo_tb_advanced->add( iv_txt = 'Make off-line'
                            iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ).
       IF iv_rstate IS INITIAL AND iv_lstate IS INITIAL.
-        lo_tb_advanced->add( iv_txt = 'Remove/Ignore files'
-                             iv_act = |{ gc_action-go_manage_files }?{ lv_key }| ).
+        lo_tb_advanced->add( iv_txt = 'Force stage'
+                             iv_act = |{ gc_action-go_stage }?{ lv_key }| ).
       ENDIF.
     ELSE.
       lo_tb_advanced->add( iv_txt = 'Make on-line'