Refactor

2026-04-22 23:49:09 -04:00 · 2025-02-09 15:41:37 +00:00
parent d7f11c5d1a
commit d2c31cdc6f
78 changed files with 24 additions and 179 deletions
--- a/app/src/main/java/io/xpipe/app/beacon/impl/TerminalPrepareExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/beacon/impl/TerminalPrepareExchangeImpl.java
@@ -11,7 +11,7 @@ import io.xpipe.beacon.api.TerminalPrepareExchange;
 public class TerminalPrepareExchangeImpl extends TerminalPrepareExchange {

    @Override
-    public Object handle(HttpExchange exchange, Request msg) throws BeaconClientException, BeaconServerException {
+    public Object handle(HttpExchange exchange, Request msg) throws BeaconClientException {
        TerminalView.get().open(msg.getRequest(), msg.getPid());
        TerminalLauncherManager.registerPid(msg.getRequest(), msg.getPid());
        var term = AppPrefs.get().terminalType().getValue();
--- a/app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java
@@ -1,7 +1,6 @@
 package io.xpipe.app.beacon.impl;

 import io.xpipe.app.terminal.TerminalLauncherManager;
-import io.xpipe.app.terminal.TerminalView;
 import io.xpipe.beacon.BeaconClientException;
 import io.xpipe.beacon.BeaconServerException;
 import io.xpipe.beacon.api.TerminalWaitExchange;
--- a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java
@@ -11,8 +11,6 @@ import io.xpipe.app.comp.base.LeftSplitPaneComp;
 import io.xpipe.app.comp.base.StackComp;
 import io.xpipe.app.comp.base.VerticalComp;
 import io.xpipe.app.comp.store.StoreEntryWrapper;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppLayoutModel;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.storage.DataStoreEntryRef;
--- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java
@@ -12,7 +12,6 @@ import io.xpipe.app.comp.base.LoadingOverlayComp;
 import io.xpipe.app.comp.base.StackComp;
 import io.xpipe.app.comp.base.VerticalComp;
 import io.xpipe.app.comp.store.StoreEntryWrapper;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppLayoutModel;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.util.BindingsHelper;
--- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java
@@ -2,7 +2,6 @@ package io.xpipe.app.browser;

 import io.xpipe.app.browser.file.BrowserFileSystemTabModel;
 import io.xpipe.app.browser.file.BrowserHistorySavedState;
-import io.xpipe.app.browser.file.BrowserHistorySavedStateImpl;
 import io.xpipe.app.browser.file.BrowserHistoryTabModel;
 import io.xpipe.app.browser.file.BrowserTransferModel;
 import io.xpipe.app.prefs.AppPrefs;
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java
@@ -4,14 +4,11 @@ import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.util.PlatformThread;
 import io.xpipe.core.store.FileNames;

-import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Background;
 import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
 import javafx.util.Callback;

 import atlantafx.base.controls.Breadcrumbs;
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserClipboard.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserClipboard.java
@@ -3,7 +3,6 @@ package io.xpipe.app.browser.file;
 import io.xpipe.app.ext.ProcessControlProvider;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.util.ThreadHelper;
-import io.xpipe.core.process.OsType;
 import io.xpipe.core.store.FileEntry;
 import io.xpipe.core.util.FailableRunnable;

--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java
@@ -4,7 +4,6 @@ import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.CompStructure;
 import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.store.*;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.util.PlatformThread;

--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java
@@ -1,7 +1,6 @@
 package io.xpipe.app.browser.file;

 import io.xpipe.app.browser.action.BrowserAction;
-import io.xpipe.app.core.AppFont;
 import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.util.InputHelper;

--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java
@@ -2,7 +2,6 @@ package io.xpipe.app.browser.file;

 import io.xpipe.app.browser.action.BrowserAction;
 import io.xpipe.app.comp.SimpleComp;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.util.*;
 import io.xpipe.core.process.OsType;
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
@@ -10,7 +10,6 @@ import io.xpipe.app.ext.ProcessControlProvider;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.prefs.AppPrefs;
-import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntryRef;
 import io.xpipe.app.terminal.*;
 import io.xpipe.app.util.BooleanScope;
@@ -312,7 +311,7 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab<File
                    var open = new ShellOpenFunction() {

                        @Override
-                        public CommandBuilder prepareWithoutInitCommand() throws Exception {
+                        public CommandBuilder prepareWithoutInitCommand() {
                            return CommandBuilder.ofString(adjustedPath);
                        }

--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserHistoryTabComp.java
@@ -4,11 +4,9 @@ import io.xpipe.app.browser.BrowserFullSessionModel;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.base.*;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.storage.DataStorage;
-import io.xpipe.app.util.BindingsHelper;
 import io.xpipe.app.util.DerivedObservableList;
 import io.xpipe.app.util.LabelGraphic;
 import io.xpipe.app.util.ThreadHelper;
@@ -16,16 +14,12 @@ import io.xpipe.app.util.ThreadHelper;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.value.ObservableBooleanValue;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
-import javafx.scene.control.Label;
 import javafx.scene.layout.*;

-import atlantafx.base.controls.Spacer;
 import atlantafx.base.theme.Styles;

 import java.util.LinkedHashMap;
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java
@@ -3,8 +3,6 @@ package io.xpipe.app.browser.file;
 import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.base.SimpleTitledPaneComp;
 import io.xpipe.app.comp.base.VerticalComp;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.util.DerivedObservableList;
--- a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java
@@ -3,8 +3,6 @@ package io.xpipe.app.browser.file;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.base.*;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.util.DerivedObservableList;
 import io.xpipe.app.util.ThreadHelper;
--- a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java
@@ -3,8 +3,6 @@ package io.xpipe.app.comp.base;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.CompStructure;
 import io.xpipe.app.comp.store.StoreViewState;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppLayoutModel;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.storage.DataStorage;
--- a/app/src/main/java/io/xpipe/app/comp/base/CountComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/CountComp.java
@@ -6,9 +6,7 @@ import io.xpipe.app.comp.SimpleCompStructure;
 import io.xpipe.app.util.PlatformThread;

 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
 import javafx.beans.value.ObservableIntegerValue;
-import javafx.collections.ObservableList;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.OverrunStyle;
--- a/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
@@ -11,7 +11,6 @@ import javafx.beans.value.ObservableValue;
 import javafx.css.Size;
 import javafx.css.SizeUnits;
 import javafx.scene.control.Button;
-import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;

 import org.kordamp.ikonli.javafx.FontIcon;
--- a/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java
@@ -7,9 +7,7 @@ import io.xpipe.app.util.DerivedObservableList;
 import io.xpipe.app.util.PlatformThread;

 import javafx.application.Platform;
-import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
--- a/app/src/main/java/io/xpipe/app/comp/base/ListVirtualViewComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ListVirtualViewComp.java
@@ -9,7 +9,6 @@ import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
-import javafx.scene.Node;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.skin.VirtualFlow;
--- a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayContentComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayContentComp.java
@@ -6,9 +6,9 @@ import javafx.beans.value.ObservableValue;

 import lombok.Getter;

+@Getter
 public abstract class ModalOverlayContentComp extends SimpleComp {

-    @Getter
    protected ModalOverlay modalOverlay;

    void setModalOverlay(ModalOverlay modalOverlay) {
--- a/app/src/main/java/io/xpipe/app/comp/store/OsLogoComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/OsLogoComp.java
@@ -4,7 +4,6 @@ import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.base.PrettyImageHelper;
 import io.xpipe.app.comp.base.StackComp;
 import io.xpipe.app.resources.AppResources;
-import io.xpipe.app.util.BindingsHelper;
 import io.xpipe.core.process.SystemState;
 import io.xpipe.core.store.FileNames;

--- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java
@@ -10,7 +10,6 @@ import io.xpipe.app.util.PlatformThread;

 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.beans.value.ObservableNumberValue;
 import javafx.beans.value.ObservableStringValue;
 import javafx.collections.FXCollections;

--- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java
@@ -3,7 +3,6 @@ package io.xpipe.app.comp.store;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.augment.GrowAugment;
 import io.xpipe.app.comp.base.*;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.core.window.AppWindowHelper;
 import io.xpipe.app.ext.DataStoreCreationCategory;
@@ -24,7 +23,6 @@ import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
 import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Region;
@@ -33,7 +31,6 @@ import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;

-import atlantafx.base.controls.Spacer;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
 import net.synedra.validatorfx.GraphicDecorationStackPane;
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
@@ -16,7 +16,6 @@ import io.xpipe.app.resources.AppResources;
 import io.xpipe.app.storage.DataColor;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntry;
-import io.xpipe.app.core.AppDistributionType;
 import io.xpipe.app.util.*;

 import io.xpipe.core.process.OsType;
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
@@ -8,7 +8,6 @@ import io.xpipe.app.storage.DataColor;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreCategory;
 import io.xpipe.app.storage.DataStoreEntry;
-import io.xpipe.app.util.BindingsHelper;
 import io.xpipe.app.util.PlatformThread;
 import io.xpipe.app.util.ThreadHelper;
 import io.xpipe.core.store.DataStore;
@@ -16,7 +15,6 @@ import io.xpipe.core.store.SingletonSessionStore;

 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.beans.value.ObservableStringValue;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;

--- a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceComp.java
@@ -1,8 +1,6 @@
 package io.xpipe.app.comp.store;

 import atlantafx.base.theme.Styles;
-import io.xpipe.app.comp.Comp;
-import io.xpipe.app.comp.CompStructure;
 import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.base.*;
 import io.xpipe.app.core.AppI18n;
@@ -10,11 +8,9 @@ import io.xpipe.app.icon.SystemIcon;

 import io.xpipe.app.icon.SystemIconCache;
 import io.xpipe.app.icon.SystemIconManager;
-import io.xpipe.app.resources.AppImages;
 import io.xpipe.app.util.BooleanScope;
 import io.xpipe.app.util.LabelGraphic;
 import io.xpipe.app.util.ThreadHelper;
-import javafx.application.Platform;
 import javafx.beans.property.*;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
@@ -23,7 +19,6 @@ import javafx.scene.layout.Region;

 import atlantafx.base.theme.Tweaks;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import javafx.scene.text.TextAlignment;

 import java.util.*;
@@ -108,7 +103,7 @@ public class StoreIconChoiceComp extends SimpleComp {

    private void updateData(TableView<List<SystemIcon>> table, String filterString) {
        var displayedIcons = filterString == null || filterString.isBlank() || filterString.length() < 2
-                ? icons.stream().sorted(Comparator.<SystemIcon, String>comparing(systemIcon -> systemIcon.getId())).toList()
+                ? icons.stream().sorted(Comparator.comparing(systemIcon -> systemIcon.getId())).toList()
                : icons.stream()
                        .filter(icon -> containsString(icon.getId(), filterString))
                        .toList();
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java
@@ -5,7 +5,6 @@ import io.xpipe.app.icon.SystemIcon;
 import io.xpipe.app.icon.SystemIconManager;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.storage.DataStoreEntry;
-import io.xpipe.app.util.Hyperlinks;

 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java
@@ -15,7 +15,6 @@ import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;

 import lombok.Getter;
-import lombok.Value;

 import java.util.ArrayList;
 import java.util.Comparator;
--- a/app/src/main/java/io/xpipe/app/core/AppFont.java
+++ b/app/src/main/java/io/xpipe/app/core/AppFont.java
@@ -4,7 +4,6 @@ import io.xpipe.app.issue.TrackEvent;
 import io.xpipe.app.resources.AppResources;
 import io.xpipe.core.process.OsType;

-import javafx.scene.Node;
 import javafx.scene.text.Font;

 import org.kordamp.ikonli.javafx.FontIcon;
--- a/app/src/main/java/io/xpipe/app/core/AppI18n.java
+++ b/app/src/main/java/io/xpipe/app/core/AppI18n.java
@@ -7,28 +7,13 @@ import io.xpipe.app.prefs.SupportedLocale;
 import io.xpipe.app.util.BindingsHelper;
 import io.xpipe.app.util.PlatformState;
 import io.xpipe.app.util.PlatformThread;
-import io.xpipe.core.util.XPipeInstallation;

 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;

-import lombok.Value;
-import org.apache.commons.io.FilenameUtils;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Pattern;

 public class AppI18n {

--- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
+++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
@@ -4,7 +4,6 @@ import io.xpipe.app.browser.BrowserFullSessionComp;
 import io.xpipe.app.browser.BrowserFullSessionModel;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.store.StoreLayoutComp;
-import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.prefs.AppPrefsComp;
 import io.xpipe.app.util.Hyperlinks;
 import io.xpipe.app.util.LabelGraphic;
--- a/app/src/main/java/io/xpipe/app/core/AppProperties.java
+++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java
@@ -97,8 +97,7 @@ public class AppProperties {
        staging = Optional.ofNullable(System.getProperty("io.xpipe.app.staging"))
                .map(Boolean::parseBoolean)
                .orElse(false);
-        devLoginPassword = Optional.ofNullable(System.getProperty("io.xpipe.app.loginPassword"))
-                .orElse(null);
+        devLoginPassword = System.getProperty("io.xpipe.app.loginPassword");
        useVirtualThreads = Optional.ofNullable(System.getProperty("io.xpipe.app.useVirtualThreads"))
                .map(Boolean::parseBoolean)
                .orElse(true);
--- a/app/src/main/java/io/xpipe/app/core/AppStyle.java
+++ b/app/src/main/java/io/xpipe/app/core/AppStyle.java
@@ -7,7 +7,6 @@ import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.resources.AppResources;

 import javafx.application.Platform;
-import javafx.beans.value.ObservableValue;
 import javafx.scene.Scene;

 import java.io.IOException;
--- a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
@@ -45,7 +45,7 @@ public class BaseMode extends OperationMode {
    }

    @Override
-    public void onSwitchTo() throws Throwable {
+    public void onSwitchTo() {
        if (initialized) {
            return;
        }
--- a/app/src/main/java/io/xpipe/app/core/window/AppDialog.java
+++ b/app/src/main/java/io/xpipe/app/core/window/AppDialog.java
@@ -3,8 +3,6 @@ package io.xpipe.app.core.window;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.ModalButton;
 import io.xpipe.app.comp.base.ModalOverlay;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.util.PlatformInit;
 import io.xpipe.app.util.PlatformThread;
@@ -12,7 +10,6 @@ import io.xpipe.app.util.ThreadHelper;

 import javafx.animation.PauseTransition;
 import javafx.application.Platform;
-import javafx.beans.Observable;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
--- a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java
+++ b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java
@@ -9,7 +9,6 @@ import io.xpipe.app.issue.TrackEvent;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.prefs.CloseBehaviourDialog;
 import io.xpipe.app.resources.AppImages;
-import io.xpipe.app.core.AppDistributionType;
 import io.xpipe.app.util.LicenseProvider;
 import io.xpipe.app.util.PlatformThread;
 import io.xpipe.app.util.ThreadHelper;
--- a/app/src/main/java/io/xpipe/app/ext/ActionProvider.java
+++ b/app/src/main/java/io/xpipe/app/ext/ActionProvider.java
@@ -142,7 +142,7 @@ public interface ActionProvider {
        }

        static <T extends DataStore> LeafDataStoreCallSite<T> simple(boolean major, String nameKey, String icon, Class<T> applicableClass, FailableConsumer<DataStoreEntryRef<T>, Exception> action) {
-            return new LeafDataStoreCallSite<T>() {
+            return new LeafDataStoreCallSite<>() {
                @Override
                public boolean isMajor(DataStoreEntryRef<T> o) {
                    return major;
--- a/app/src/main/java/io/xpipe/app/icon/SystemIconCache.java
+++ b/app/src/main/java/io/xpipe/app/icon/SystemIconCache.java
@@ -6,7 +6,6 @@ import com.github.weisj.jsvg.attributes.ViewBox;
 import com.github.weisj.jsvg.parser.SVGLoader;
 import io.xpipe.app.core.AppProperties;
 import io.xpipe.app.issue.ErrorEvent;
-import io.xpipe.app.resources.AppImages;
 import lombok.Getter;

 import javax.imageio.ImageIO;
--- a/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java
+++ b/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java
@@ -29,7 +29,7 @@ public interface SystemIconSource {
    @Builder
    @Jacksonized
    @JsonTypeName("directory")
-    static class Directory implements SystemIconSource{
+    class Directory implements SystemIconSource{

        Path path;
        String id;
@@ -76,7 +76,7 @@ public interface SystemIconSource {
    @Builder
    @Jacksonized
    @JsonTypeName("git")
-    static class GitRepository implements SystemIconSource{
+    class GitRepository implements SystemIconSource{

        String remote;
        String id;
@@ -120,7 +120,7 @@ public interface SystemIconSource {
        }

        @Override
-        public void open() throws Exception {
+        public void open() {
            Hyperlinks.open(remote);
        }
    }
--- a/app/src/main/java/io/xpipe/app/icon/SystemIconSourceData.java
+++ b/app/src/main/java/io/xpipe/app/icon/SystemIconSourceData.java
@@ -5,11 +5,9 @@ import lombok.Value;
 import org.apache.commons.io.FilenameUtils;

 import java.io.IOException;
-import java.nio.file.FileVisitOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;

@@ -19,7 +17,7 @@ public class SystemIconSourceData {
    Path directory;
    List<SystemIconSourceFile> icons;

-    public static SystemIconSourceData of(SystemIconSource source) throws IOException {
+    public static SystemIconSourceData of(SystemIconSource source) {
        var target = source.getPath();
        var list = new ArrayList<SystemIconSourceFile>();
        walkTree(source, target, list);
--- a/app/src/main/java/io/xpipe/app/issue/EventHandlerImpl.java
+++ b/app/src/main/java/io/xpipe/app/issue/EventHandlerImpl.java
@@ -3,7 +3,6 @@ package io.xpipe.app.issue;
 import io.xpipe.app.core.AppLogs;
 import io.xpipe.app.core.AppProperties;
 import io.xpipe.app.core.mode.OperationMode;
-import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.core.util.Deobfuscator;

 import java.nio.file.Path;
--- a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java
+++ b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java
@@ -5,7 +5,6 @@ import io.xpipe.app.comp.base.ModalOverlay;
 import io.xpipe.app.core.*;
 import io.xpipe.app.core.mode.OperationMode;
 import io.xpipe.app.core.window.AppDialog;
-import io.xpipe.app.core.AppDistributionType;
 import io.xpipe.app.util.Hyperlinks;
 import io.xpipe.app.util.PlatformInit;
 import io.xpipe.app.util.ThreadHelper;
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
@@ -10,7 +10,6 @@ import io.xpipe.app.icon.SystemIconSource;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.terminal.ExternalTerminalType;
-import io.xpipe.app.core.AppDistributionType;
 import io.xpipe.app.util.PlatformThread;
 import io.xpipe.core.util.ModuleHelper;

--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java
@@ -1,8 +1,6 @@
 package io.xpipe.app.prefs;

 import io.xpipe.app.comp.SimpleComp;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.util.PlatformThread;

 import javafx.geometry.Insets;
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
@@ -1,8 +1,5 @@
 package io.xpipe.app.prefs;

-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 import io.xpipe.app.ext.PrefsChoiceValue;
 import io.xpipe.app.issue.ErrorEvent;
@@ -13,7 +10,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.NullNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import lombok.SneakyThrows;
--- a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java
@@ -2,27 +2,17 @@ package io.xpipe.app.prefs;

 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.*;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
-import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.core.window.AppDialog;
-import io.xpipe.app.ext.PrefsChoiceValue;
-import io.xpipe.app.icon.SystemIcon;
-import io.xpipe.app.icon.SystemIconCache;
 import io.xpipe.app.icon.SystemIconManager;
 import io.xpipe.app.icon.SystemIconSource;
 import io.xpipe.app.storage.DataStorage;
-import io.xpipe.app.storage.DataStorageUserHandler;
 import io.xpipe.app.util.*;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
 import javafx.scene.control.TextField;
-import org.kordamp.ikonli.javafx.FontIcon;

 import java.nio.file.Path;
 import java.util.ArrayList;
--- a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java
@@ -1,13 +1,11 @@
 package io.xpipe.app.prefs;

-import atlantafx.base.layout.ModalBox;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.ButtonComp;
 import io.xpipe.app.comp.base.ModalButton;
 import io.xpipe.app.comp.base.ModalOverlay;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.core.window.AppDialog;
-import io.xpipe.app.core.window.AppWindowHelper;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStorageSyncHandler;
 import io.xpipe.app.storage.DataStorageUserHandler;
--- a/app/src/main/java/io/xpipe/app/storage/DataStorageSecret.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorageSecret.java
@@ -15,8 +15,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
-import lombok.Value;
-import lombok.experimental.NonFinal;

 import java.io.IOException;

--- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
@@ -758,6 +758,6 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
            launch(configuration.getColoredTitle(), args);
        }

-        protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception;
+        protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration);
    }
 }
--- a/app/src/main/java/io/xpipe/app/terminal/PtyxisTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/PtyxisTerminalType.java
@@ -1,9 +1,6 @@
 package io.xpipe.app.terminal;

-import io.xpipe.app.util.CommandSupport;
-import io.xpipe.app.util.LocalShell;
 import io.xpipe.core.process.CommandBuilder;
-import io.xpipe.core.process.ShellControl;

 public class PtyxisTerminalType extends ExternalTerminalType.SimplePathType implements TrackableTerminalType {

@@ -32,7 +29,7 @@ public class PtyxisTerminalType extends ExternalTerminalType.SimplePathType impl
    }

    @Override
-    protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception {
+    protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) {
        var toExecute = CommandBuilder.of()
                .add(executable)
                .addIf(configuration.isPreferTabs(), "--tab")
--- a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
@@ -148,7 +148,7 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
        }

        @Override
-        protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception {
+        protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) {
            return WindowsTerminalType.toCommand(configuration);
        }

--- a/app/src/main/java/io/xpipe/app/test/TestModule.java
+++ b/app/src/main/java/io/xpipe/app/test/TestModule.java
@@ -50,7 +50,7 @@ public abstract class TestModule<V> {
        return argumentBuilder.build();
    }

-    protected abstract void init(Map<String, FailableSupplier<V>> list) throws Exception;
+    protected abstract void init(Map<String, FailableSupplier<V>> list);

    protected abstract Class<V> getValueClass();
 }
--- a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
@@ -3,7 +3,6 @@ package io.xpipe.app.util;
 import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;

-import io.xpipe.core.process.OsType;
 import javafx.application.Platform;
 import javafx.geometry.Side;
 import javafx.scene.Node;
--- a/app/src/main/java/io/xpipe/app/util/LocalExec.java
+++ b/app/src/main/java/io/xpipe/app/util/LocalExec.java
@@ -1,13 +1,9 @@
 package io.xpipe.app.util;

-import io.xpipe.app.core.AppProperties;
-import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.issue.TrackEvent;

 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Optional;
-import java.util.stream.Collectors;

 public class LocalExec {

--- a/app/src/main/java/io/xpipe/app/util/LocalShellCache.java
+++ b/app/src/main/java/io/xpipe/app/util/LocalShellCache.java
@@ -5,7 +5,6 @@ import io.xpipe.app.prefs.ExternalApplicationType;
 import io.xpipe.app.prefs.ExternalEditorType;
 import io.xpipe.core.process.OsType;
 import io.xpipe.core.process.ShellControl;
-import io.xpipe.core.store.FilePath;

 import java.nio.file.Path;
 import java.util.Optional;
--- a/app/src/main/java/io/xpipe/app/util/PasswdFile.java
+++ b/app/src/main/java/io/xpipe/app/util/PasswdFile.java
@@ -10,6 +10,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.OptionalInt;

+@Getter
 public class PasswdFile {

    public static PasswdFile parse(ShellControl sc) throws Exception {
@@ -18,7 +19,6 @@ public class PasswdFile {
        return passwdFile;
    }

-    @Getter
    private final Map<Integer, String> users = new LinkedHashMap<>();

    public OptionalInt getUidForUserIfPresent(String name) {
--- a/app/src/main/java/io/xpipe/app/util/ScanDialog.java
+++ b/app/src/main/java/io/xpipe/app/util/ScanDialog.java
@@ -1,6 +1,5 @@
 package io.xpipe.app.util;

-import io.xpipe.app.comp.base.LoadingOverlayComp;
 import io.xpipe.app.comp.base.ModalButton;
 import io.xpipe.app.comp.base.ModalOverlay;
 import io.xpipe.app.ext.ScanProvider;
--- a/app/src/main/java/io/xpipe/app/util/ScanDialogComp.java
+++ b/app/src/main/java/io/xpipe/app/util/ScanDialogComp.java
@@ -15,7 +15,6 @@ import io.xpipe.app.storage.DataStoreEntryRef;

 import javafx.application.Platform;
 import javafx.beans.property.*;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.layout.Region;
@@ -24,7 +23,6 @@ import javafx.scene.layout.VBox;
 import lombok.Getter;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.function.Function;

 import static javafx.scene.layout.Priority.ALWAYS;
--- a/app/src/main/java/io/xpipe/app/util/SecretQueryFormatter.java
+++ b/app/src/main/java/io/xpipe/app/util/SecretQueryFormatter.java
@@ -1,7 +1,5 @@
 package io.xpipe.app.util;

-import io.xpipe.core.util.SecretValue;
-
 import java.util.Optional;

 public interface SecretQueryFormatter {
--- a/app/src/main/java/io/xpipe/app/util/ShellControlCache.java
+++ b/app/src/main/java/io/xpipe/app/util/ShellControlCache.java
@@ -1,18 +1,12 @@
 package io.xpipe.app.util;

-import io.xpipe.app.prefs.ExternalApplicationType;
-import io.xpipe.app.prefs.ExternalEditorType;
-import io.xpipe.core.process.OsType;
 import io.xpipe.core.process.ShellControl;
-import io.xpipe.core.store.FilePath;
 import io.xpipe.core.util.FailableSupplier;

 import lombok.Getter;

-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Supplier;

@Getter
--- a/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java
+++ b/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java
@@ -2,7 +2,6 @@ package io.xpipe.app.util;

 import io.xpipe.app.comp.store.StoreSection;
 import io.xpipe.app.core.AppI18n;
-import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.core.process.ShellDialects;
 import io.xpipe.core.process.ShellEnvironmentStoreState;
 import io.xpipe.core.process.ShellStoreState;
--- a/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java
+++ b/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java
@@ -66,7 +66,7 @@ public abstract class WindowsRegistry {
        }

        @Override
-        public List<String> listSubKeys(int hkey, String key) throws Exception {
+        public List<String> listSubKeys(int hkey, String key) {
            // This can fail even with errors in case the jna native library extraction or loading fails
            try {
                return Arrays.asList(Advapi32Util.registryGetKeys(hkey(hkey), key));
@@ -88,7 +88,7 @@ public abstract class WindowsRegistry {
        }

        @Override
-        public OptionalInt readIntegerValueIfPresent(int hkey, String key, String valueName) throws Exception {
+        public OptionalInt readIntegerValueIfPresent(int hkey, String key, String valueName) {
            // This can fail even with errors in case the jna native library extraction or loading fails
            try {
                if (!Advapi32Util.registryValueExists(hkey(hkey), key, valueName)) {
--- a/core/src/main/java/io/xpipe/core/process/TerminalLaunchCommandFunction.java
+++ b/core/src/main/java/io/xpipe/core/process/TerminalLaunchCommandFunction.java
@@ -1,9 +1,6 @@
 package io.xpipe.core.process;

-import io.xpipe.core.store.FilePath;
-import io.xpipe.core.util.FailableFunction;
-
 public interface TerminalLaunchCommandFunction {

-    CommandBuilder apply(ShellControl shellControl, boolean requiresExecutableFirst, boolean supportsRawArguments, String file, boolean exit) throws Exception;
+    CommandBuilder apply(ShellControl shellControl, boolean requiresExecutableFirst, boolean supportsRawArguments, String file, boolean exit);
 }
--- a/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java
+++ b/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java
@@ -15,9 +15,9 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Function;

+@Getter
 public class WrapperShellControl implements ShellControl {

-    @Getter
    protected final ShellControl parent;

    public WrapperShellControl(ShellControl parent) {
--- a/core/src/main/java/io/xpipe/core/util/JacksonExtension.java
+++ b/core/src/main/java/io/xpipe/core/util/JacksonExtension.java
@@ -1,7 +1,5 @@
 package io.xpipe.core.util;

-import com.fasterxml.jackson.databind.*;
-
 public interface JacksonExtension {

    Class<?> getType();
--- a/ext/base/src/main/java/io/xpipe/ext/base/SelfReferentialStore.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/SelfReferentialStore.java
@@ -10,7 +10,7 @@ import java.util.UUID;

 public interface SelfReferentialStore extends DataStore {

-    static Map<DataStore, DataStoreEntry> FALLBACK = new HashMap<>();
+    Map<DataStore, DataStoreEntry> FALLBACK = new HashMap<>();

    default DataStoreEntry getSelfEntry() {
        return DataStorage.get()
--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java
@@ -18,7 +18,7 @@ import java.util.List;
 public class BackAction implements BrowserLeafAction {

    @Override
-    public void execute(BrowserFileSystemTabModel model, List<BrowserEntry> entries) throws Exception {
+    public void execute(BrowserFileSystemTabModel model, List<BrowserEntry> entries) {
        model.backSync(1);
    }

--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java
@@ -18,7 +18,7 @@ import java.util.List;
 public class ForwardAction implements BrowserLeafAction {

    @Override
-    public void execute(BrowserFileSystemTabModel model, List<BrowserEntry> entries) throws Exception {
+    public void execute(BrowserFileSystemTabModel model, List<BrowserEntry> entries) {
        model.forthSync(1);
    }

--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java
@@ -1,16 +1,12 @@
 package io.xpipe.ext.base.browser;

-import atlantafx.base.layout.ModalBox;
 import io.xpipe.app.browser.action.BrowserBranchAction;
 import io.xpipe.app.browser.action.BrowserLeafAction;
 import io.xpipe.app.browser.file.BrowserEntry;
 import io.xpipe.app.browser.file.BrowserFileSystemTabModel;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.ModalOverlay;
-import io.xpipe.app.core.AppFont;
-import io.xpipe.app.core.AppFontSizes;
 import io.xpipe.app.core.AppI18n;
-import io.xpipe.app.core.window.AppDialog;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.core.process.CommandBuilder;
@@ -20,7 +16,6 @@ import io.xpipe.core.process.ShellControl;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.StackPane;
-import javafx.scene.text.Text;

 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java
@@ -11,7 +11,6 @@ import io.xpipe.app.comp.store.StoreEntryWrapper;
 import io.xpipe.app.comp.store.StoreViewState;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.ext.DataStoreCreationCategory;
-import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.storage.DataStoreEntryRef;
--- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java
@@ -18,7 +18,6 @@ import io.xpipe.app.util.Validator;
 import io.xpipe.core.process.ShellDialect;
 import io.xpipe.core.process.ShellDialects;
 import io.xpipe.core.store.DataStore;
-import io.xpipe.core.util.Identifiers;

 import javafx.beans.binding.Bindings;
 import javafx.beans.property.Property;
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java
@@ -5,7 +5,6 @@ import io.xpipe.app.comp.store.*;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.ext.DataStoreProvider;
 import io.xpipe.app.ext.DataStoreUsageCategory;
-import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.util.ThreadHelper;
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStore.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStore.java
@@ -2,7 +2,6 @@ package io.xpipe.ext.base.service;

 import io.xpipe.app.util.Validators;
 import io.xpipe.core.store.DataStore;
-import io.xpipe.core.store.NetworkTunnelStore;

 import com.fasterxml.jackson.annotation.JsonTypeName;
 import lombok.*;
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlSession.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlSession.java
@@ -2,10 +2,8 @@ package io.xpipe.ext.base.service;

 import io.xpipe.core.process.CommandBuilder;
 import io.xpipe.core.process.ElevationFunction;
-import io.xpipe.core.process.ShellControl;
 import io.xpipe.core.store.Session;
 import io.xpipe.core.store.SessionListener;
-import io.xpipe.core.util.FailableSupplier;
 import lombok.Getter;

@Getter
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStore.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStore.java
@@ -2,18 +2,11 @@ package io.xpipe.ext.base.service;

 import com.fasterxml.jackson.annotation.JsonTypeName;
 import io.xpipe.app.ext.ShellStore;
-import io.xpipe.app.storage.DataStorage;
 import io.xpipe.app.storage.DataStoreEntryRef;
-import io.xpipe.app.util.HostHelper;
-import io.xpipe.app.util.LicenseProvider;
 import io.xpipe.core.process.ShellScript;
 import io.xpipe.app.util.Validators;
 import io.xpipe.core.store.DataStore;
-import io.xpipe.core.store.NetworkTunnelSession;
-import io.xpipe.core.store.NetworkTunnelStore;
 import io.xpipe.core.store.SingletonSessionStore;
-import io.xpipe.ext.base.store.StartableStore;
-import io.xpipe.ext.base.store.StoppableStore;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
@@ -39,7 +32,7 @@ public class ServiceControlStore implements SingletonSessionStore<ServiceControl
    }

    @Override
-    public ServiceControlSession newSession() throws Exception {
+    public ServiceControlSession newSession() {
        return new ServiceControlSession(running -> {}, this);
    }

--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java
@@ -1,6 +1,5 @@
 package io.xpipe.ext.base.service;

-import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.base.IntegratedTextAreaComp;
 import io.xpipe.app.comp.store.*;
 import io.xpipe.app.core.AppI18n;
@@ -11,19 +10,13 @@ import io.xpipe.app.storage.DataStoreEntry;
 import io.xpipe.app.util.DataStoreFormatter;
 import io.xpipe.app.util.OptionsBuilder;
 import io.xpipe.app.util.ShellStoreFormat;
-import io.xpipe.core.process.ShellDialect;
 import io.xpipe.core.store.DataStore;
-import io.xpipe.ext.base.script.ScriptStore;
-import io.xpipe.ext.base.script.SimpleScriptStore;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;

-import java.util.ArrayList;
 import java.util.List;

 public class ServiceControlStoreProvider implements SingletonSessionStoreProvider, DataStoreProvider {
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolType.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolType.java
@@ -1,17 +1,11 @@
 package io.xpipe.ext.base.service;

-import io.xpipe.app.issue.ErrorEvent;
-import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.prefs.ExternalApplicationHelper;
-import io.xpipe.app.util.CommandSupport;
 import io.xpipe.app.util.Hyperlinks;

 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.xpipe.app.util.LocalShell;
-import io.xpipe.core.process.CommandBuilder;
-import io.xpipe.core.process.OsType;
 import lombok.Builder;
 import lombok.Value;
 import lombok.extern.jackson.Jacksonized;
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java
@@ -1,14 +1,11 @@
 package io.xpipe.ext.base.service;

-import io.xpipe.app.comp.Comp;
-import io.xpipe.app.comp.CompStructure;
 import io.xpipe.app.comp.base.TextFieldComp;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.util.OptionsBuilder;

 import javafx.beans.property.*;
 import javafx.beans.value.ObservableValue;
-import javafx.scene.control.TextField;

 import java.util.LinkedHashMap;