diff --git a/base/utils/debug/debug_android.go b/base/utils/debug/debug_android.go
index 265702e7..708c4e76 100644
--- a/base/utils/debug/debug_android.go
+++ b/base/utils/debug/debug_android.go
@@ -1,31 +1,34 @@
 package debug
 
-import (
-	"context"
-	"fmt"
+// TODO: Re-enable Android interfaces.
+// Deactived for transition to new module system.
 
-	"github.com/safing/portmaster-android/go/app_interface"
-)
+// import (
+// 	"context"
+// 	"fmt"
 
-// AddPlatformInfo adds OS and platform information.
-func (di *Info) AddPlatformInfo(_ context.Context) {
-	// Get information from the system.
-	info, err := app_interface.GetPlatformInfo()
-	if err != nil {
-		di.AddSection(
-			"Platform Information",
-			NoFlags,
-			fmt.Sprintf("Failed to get: %s", err),
-		)
-		return
-	}
+// 	"github.com/safing/portmaster-android/go/app_interface"
+// )
 
-	// Add section.
-	di.AddSection(
-		fmt.Sprintf("Platform: Android"),
-		UseCodeSection|AddContentLineBreaks,
-		fmt.Sprintf("SDK: %d", info.SDK),
-		fmt.Sprintf("Device: %s %s (%s)", info.Manufacturer, info.Brand, info.Board),
-		fmt.Sprintf("App: %s: %s %s", info.ApplicationID, info.VersionName, info.BuildType))
+// // AddPlatformInfo adds OS and platform information.
+// func (di *Info) AddPlatformInfo(_ context.Context) {
+// 	// Get information from the system.
+// 	info, err := app_interface.GetPlatformInfo()
+// 	if err != nil {
+// 		di.AddSection(
+// 			"Platform Information",
+// 			NoFlags,
+// 			fmt.Sprintf("Failed to get: %s", err),
+// 		)
+// 		return
+// 	}
 
-}
+// 	// Add section.
+// 	di.AddSection(
+// 		fmt.Sprintf("Platform: Android"),
+// 		UseCodeSection|AddContentLineBreaks,
+// 		fmt.Sprintf("SDK: %d", info.SDK),
+// 		fmt.Sprintf("Device: %s %s (%s)", info.Manufacturer, info.Brand, info.Board),
+// 		fmt.Sprintf("App: %s: %s %s", info.ApplicationID, info.VersionName, info.BuildType))
+
+// }
diff --git a/service/netenv/os_android.go b/service/netenv/os_android.go
index 15c5ceba..f21831b4 100644
--- a/service/netenv/os_android.go
+++ b/service/netenv/os_android.go
@@ -1,40 +1,43 @@
 package netenv
 
-import (
-	"net"
-	"time"
+// TODO: Re-enable Android interfaces.
+// Deactived for transition to new module system.
 
-	"github.com/safing/portmaster-android/go/app_interface"
-)
+// import (
+// 	"net"
+// 	"time"
 
-var (
-	monitorNetworkChangeOnlineTicker  = time.NewTicker(time.Second)
-	monitorNetworkChangeOfflineTicker = time.NewTicker(time.Second)
-)
+// 	"github.com/safing/portmaster-android/go/app_interface"
+// )
 
-func init() {
-	// Network change event is monitored by the android system.
-	monitorNetworkChangeOnlineTicker.Stop()
-	monitorNetworkChangeOfflineTicker.Stop()
-}
+// var (
+// 	monitorNetworkChangeOnlineTicker  = time.NewTicker(time.Second)
+// 	monitorNetworkChangeOfflineTicker = time.NewTicker(time.Second)
+// )
 
-func osGetInterfaceAddrs() ([]net.Addr, error) {
-	list, err := app_interface.GetNetworkAddresses()
-	if err != nil {
-		return nil, err
-	}
+// func init() {
+// 	// Network change event is monitored by the android system.
+// 	monitorNetworkChangeOnlineTicker.Stop()
+// 	monitorNetworkChangeOfflineTicker.Stop()
+// }
 
-	var netList []net.Addr
-	for _, addr := range list {
-		ipNetAddr, err := addr.ToIPNet()
-		if err == nil {
-			netList = append(netList, ipNetAddr)
-		}
-	}
+// func osGetInterfaceAddrs() ([]net.Addr, error) {
+// 	list, err := app_interface.GetNetworkAddresses()
+// 	if err != nil {
+// 		return nil, err
+// 	}
 
-	return netList, nil
-}
+// 	var netList []net.Addr
+// 	for _, addr := range list {
+// 		ipNetAddr, err := addr.ToIPNet()
+// 		if err == nil {
+// 			netList = append(netList, ipNetAddr)
+// 		}
+// 	}
 
-func osGetNetworkInterfaces() ([]app_interface.NetworkInterface, error) {
-	return app_interface.GetNetworkInterfaces()
-}
+// 	return netList, nil
+// }
+
+// func osGetNetworkInterfaces() ([]app_interface.NetworkInterface, error) {
+// 	return app_interface.GetNetworkInterfaces()
+// }