diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
index 228ff448733..f048893899f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
@@ -45,7 +45,6 @@
  * @author honchar
  * @author Viliam Repan (lazyman)
  * <p>
- * TODO Still needs more cleanup. Why button column has to understand activation, focus objects or handle modal windows? That should not be here definitely.
  */
 public class InlineMenuButtonColumn<T extends Serializable> extends AbstractColumn<T, String> {
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
index 25a21c17d5a..65f3ff64128 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
@@ -78,7 +78,7 @@ public FocusListInlineMenuHelper(@NotNull Class<F> objectClass, @NotNull PageBas
 		this.focusListComponent = focusListComponent;
 	}
 
-	public List<InlineMenuItem> createRowActions(boolean isHeader) {
+	public List<InlineMenuItem> createRowActions() {
 		List<InlineMenuItem> menu = new ArrayList<>();
 		menu.add(new ButtonInlineMenuItem(parentPage.createStringResource("FocusListInlineMenuHelper.menu.enable")) {
 			private static final long serialVersionUID = 1L;
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
index 30a7c335150..7eddab7c4e6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
@@ -104,7 +104,7 @@ private void initLayout() {
 
 			@Override
 			protected List<InlineMenuItem> createInlineMenu() {
-				return listInlineMenuHelper.createRowActions(false);
+				return listInlineMenuHelper.createRowActions();
 			}
 
 			@Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
index 3c5eef0ba29..425925e9261 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
@@ -396,13 +396,13 @@ public Object getObject() {
 		columns.add(check);
 		columns.add(new PropertyColumn(createStringResource("pageTasks.node.statusMessage"), "statusMessage"));
 
-		IColumn<NodeDto, String> menuColumn = new InlineMenuButtonColumn<NodeDto>(createNodesInlineMenu(false), PageTasks.this);
+		IColumn<NodeDto, String> menuColumn = new InlineMenuButtonColumn<NodeDto>(createNodesInlineMenu(), PageTasks.this);
 		columns.add(menuColumn);
 
 		return columns;
 	}
 
-	private List<InlineMenuItem> createNodesInlineMenu(boolean isHeader) {
+	private List<InlineMenuItem> createNodesInlineMenu() {
 		List<InlineMenuItem> items = new ArrayList<>();
 		items.add(new ButtonInlineMenuItem(createStringResource("pageTasks.button.startScheduler")) {
 			private static final long serialVersionUID = 1L;
@@ -1971,7 +1971,7 @@ private void addInlineMenuToNodeRow(final NodeDto dto) {
             return;
         }
 
-        items.addAll(createNodesInlineMenu(false));
+        items.addAll(createNodesInlineMenu());
     }
 
     private IModel<String> getTaskConfirmationMessageModel(ColumnMenuAction action, String actionName){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
index 597424445ca..a8d4fbc0f55 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
@@ -106,7 +106,7 @@ protected List<IColumn<SelectableBean<ServiceType>, String>> createColumns() {
 
 			@Override
 			protected List<InlineMenuItem> createInlineMenu() {
-				return listInlineMenuHelper.createRowActions(false);
+				return listInlineMenuHelper.createRowActions();
 			}
 
 			@Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
index c07e45a1f25..fe167bc88e8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
@@ -178,7 +178,7 @@ protected List<IColumn<SelectableBean<UserType>, String>> createColumns() {
 
 			@Override
 			protected List<InlineMenuItem> createInlineMenu() {
-				return createRowActions(false);
+				return createRowActions();
 			}
 
 			@Override
@@ -255,7 +255,7 @@ public IModel<String> getDataModel(IModel<SelectableBean<UserType>> rowModel) {
 		return columns;
 	}
 
-	private List<InlineMenuItem> createRowActions(boolean isHeader) {
+	private List<InlineMenuItem> createRowActions() {
     	List<InlineMenuItem> menu = new ArrayList<>();
 		menu.add(new ButtonInlineMenuItem(createStringResource("pageUsers.menu.enable")) {
 			private static final long serialVersionUID = 1L;