diff --git a/cmd/skirk/instances.go b/cmd/skirk/instances.go
index 4c3ec52..89da870 100644
--- a/cmd/skirk/instances.go
+++ b/cmd/skirk/instances.go
@@ -488,7 +488,7 @@ func existingDefaultKitDir() (string, bool, error) {
 				return "", false, absErr
 			}
 			return kitDir, true, nil
-		} else if err != nil && !os.IsNotExist(err) {
+		} else if !os.IsNotExist(err) {
 			return "", false, err
 		}
 	}
diff --git a/cmd/skirk/uninstall.go b/cmd/skirk/uninstall.go
index 9214f5a..bf0b7a6 100644
--- a/cmd/skirk/uninstall.go
+++ b/cmd/skirk/uninstall.go
@@ -277,7 +277,7 @@ func uninstallWireproxy(ctx context.Context) error {
 			}
 			fmt.Printf("Removed wireproxy path: %s\n", defaultWireproxyDir)
 			removed = true
-		} else if err != nil && !os.IsNotExist(err) {
+		} else if !os.IsNotExist(err) {
 			return err
 		}
 		for _, path := range []string{defaultWireproxyBin, defaultWGCFBin} {
@@ -303,7 +303,7 @@ func uninstallWireproxy(ctx context.Context) error {
 		fmt.Printf("Removed wireproxy path: %s\n", defaultWireproxyDir)
 		fmt.Println("Wireproxy helper binaries left untouched because the Skirk ownership manifest is absent.")
 		removed = true
-	} else if err != nil && !os.IsNotExist(err) {
+	} else if !os.IsNotExist(err) {
 		return err
 	}
 	if !removed {
diff --git a/internal/skirk/config_test.go b/internal/skirk/config_test.go
index 0f54fc0..5530567 100644
--- a/internal/skirk/config_test.go
+++ b/internal/skirk/config_test.go
@@ -147,9 +147,6 @@ func TestConfigRejectsExperimentalTransport(t *testing.T) {
 	if err := cfg.Validate(); err == nil || !strings.Contains(err.Error(), "muxv4") {
 		t.Fatalf("err = %v, want transport validation error mentioning muxv4", err)
 	}
-	if got := normalizeMuxTransport(cfg.Tunnel.Transport); got != "muxv4" {
-		t.Fatalf("normalizeMuxTransport(experimental) = %q, want muxv4", got)
-	}
 }
 
 func TestAccessTokenSourceRefreshesBeforeExpiry(t *testing.T) {
diff --git a/internal/skirk/mux.go b/internal/skirk/mux.go
index f407701..51264b9 100644
--- a/internal/skirk/mux.go
+++ b/internal/skirk/mux.go
@@ -343,7 +343,7 @@ func newDriveMux(t *Tunnel, role string, sendDir, recvDir byte) (*driveMux, erro
 		sendDir:               sendDir,
 		recvDir:               recvDir,
 		epoch:                 epoch,
-		transport:             normalizeMuxTransport(t.Transport),
+		transport:             "muxv4",
 		streams:               map[muxStreamKey]*muxStream{},
 		opening:               map[muxStreamKey]struct{}{},
 		closed:                map[muxStreamKey]time.Time{},
@@ -388,10 +388,6 @@ func newMuxLane(m *driveMux, idx int) *muxLane {
 	}
 }
 
-func normalizeMuxTransport(transport string) string {
-	return "muxv4"
-}
-
 func (t *Tunnel) serveMuxClient(ctx context.Context, listen string) error {
 	t.role = "client"
 	if strings.TrimSpace(t.ClientID) == "" || strings.TrimSpace(t.RunID) == "" {
@@ -2724,7 +2720,7 @@ func normalReceivePauseStateForStream(stream *muxStream) (bool, bool) {
 	}
 	frames, bytes := stream.reassemblyBacklog()
 	reassemblyPaused := frames >= muxStreamPauseFrames || bytes >= muxStreamPauseBytes
-	inboundPaused := stream != nil && len(stream.inbound) >= muxStreamInboundPause
+	inboundPaused := len(stream.inbound) >= muxStreamInboundPause
 	return reassemblyPaused, inboundPaused
 }