diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 119f2a6..18f9ea1 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -7,9 +7,6 @@ import (
 	"github.com/matryer/resync"
 	"os"
 
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/matryer/resync"
-
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/provider"
 	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
diff --git a/internal/provider/service_resource.go b/internal/provider/service_resource.go
index 003471e..ea75230 100644
--- a/internal/provider/service_resource.go
+++ b/internal/provider/service_resource.go
@@ -26,9 +26,6 @@ import (
 	sdkresource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"reflect"
-	"regexp"
-	"time"
 )
 
 const defaultCreateTimeout = 60 * time.Minute
diff --git a/internal/provider/service_resource_deletion_protection_test.go b/internal/provider/service_resource_deletion_protection_test.go
index db41f95..48a53b8 100644
--- a/internal/provider/service_resource_deletion_protection_test.go
+++ b/internal/provider/service_resource_deletion_protection_test.go
@@ -14,14 +14,6 @@ import (
 	"os"
 	"testing"
 	"time"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"github.com/stretchr/testify/require"
 )
 
 func TestServiceResourceDeletionProtection(t *testing.T) {
diff --git a/internal/provider/service_resource_privatlink_test.go b/internal/provider/service_resource_privatlink_test.go
index d1fd737..96b1e39 100644
--- a/internal/provider/service_resource_privatlink_test.go
+++ b/internal/provider/service_resource_privatlink_test.go
@@ -14,14 +14,6 @@ import (
 	"os"
 	"testing"
 	"time"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"github.com/stretchr/testify/require"
 )
 
 func TestServiceResourcePrivateLink(t *testing.T) {
diff --git a/internal/provider/service_resource_sa_test.go b/internal/provider/service_resource_sa_test.go
index 75e37e3..b819c63 100644
--- a/internal/provider/service_resource_sa_test.go
+++ b/internal/provider/service_resource_sa_test.go
@@ -15,14 +15,6 @@ import (
 	"regexp"
 	"testing"
 	"time"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"github.com/stretchr/testify/require"
 )
 
 func TestServiceResourceServerlessAnalytics(t *testing.T) {
diff --git a/internal/provider/service_resource_scale_test.go b/internal/provider/service_resource_scale_test.go
index b09fecf..de48384 100644
--- a/internal/provider/service_resource_scale_test.go
+++ b/internal/provider/service_resource_scale_test.go
@@ -14,14 +14,6 @@ import (
 	"os"
 	"testing"
 	"time"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"github.com/stretchr/testify/require"
 )
 
 func TestServiceResourceScaleTest(t *testing.T) {
diff --git a/internal/provider/service_resource_test.go b/internal/provider/service_resource_test.go
index 2f3e21c..f7ba8bc 100644
--- a/internal/provider/service_resource_test.go
+++ b/internal/provider/service_resource_test.go
@@ -17,14 +17,6 @@ import (
 	"regexp"
 	"testing"
 	"time"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"github.com/stretchr/testify/require"
 )
 
 func mockSkySQLAPI(t *testing.T) (string, func(http.HandlerFunc), func()) {
diff --git a/internal/provider/service_resource_update_allowlist_test.go b/internal/provider/service_resource_update_allowlist_test.go
index c58f2d1..9be9870 100644
--- a/internal/provider/service_resource_update_allowlist_test.go
+++ b/internal/provider/service_resource_update_allowlist_test.go
@@ -14,14 +14,6 @@ import (
 	"os"
 	"testing"
 	"time"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
-	"github.com/stretchr/testify/require"
 )
 
 func TestServiceResourceAllowlistUpdate(t *testing.T) {
diff --git a/internal/provider/versions_data_source.go b/internal/provider/versions_data_source.go
index 052b2ec..43493cd 100644
--- a/internal/provider/versions_data_source.go
+++ b/internal/provider/versions_data_source.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
-	"net/url"
 )
 
 // Ensure provider defined types fully satisfy framework interfaces
diff --git a/internal/skysql/client.go b/internal/skysql/client.go
index e0ea395..39ce138 100644
--- a/internal/skysql/client.go
+++ b/internal/skysql/client.go
@@ -10,11 +10,6 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
-
-	"github.com/go-resty/resty/v2"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/organization"
-	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
 )
 
 type Client struct {