diff --git a/internal/server/analytics.go b/internal/server/analytics.go
index a1dacdc4..c19bfe2d 100644
--- a/internal/server/analytics.go
+++ b/internal/server/analytics.go
@@ -4,19 +4,11 @@ import (
 	"database/sql"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
 	"gophergate/internal/db"
-	"gophergate/internal/models"
-	"gophergate/internal/utils"
-	"log/slog"
-
-	"github.com/shirou/gopsutil/v3/cpu"
 )
 
 type UsagePeriodFilter struct {
diff --git a/internal/server/clients.go b/internal/server/clients.go
index fcc7d02e..1e81b4c1 100644
--- a/internal/server/clients.go
+++ b/internal/server/clients.go
@@ -4,19 +4,12 @@ import (
 	"database/sql"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
 	"gophergate/internal/db"
-	"gophergate/internal/models"
-	"gophergate/internal/utils"
-	"log/slog"
-
-	"github.com/shirou/gopsutil/v3/cpu"
 )
 
 func (s *Server) handleGetClients(c *gin.Context) {
diff --git a/internal/server/dashboard.go b/internal/server/dashboard.go
index df8eda4e..d9216ce7 100644
--- a/internal/server/dashboard.go
+++ b/internal/server/dashboard.go
@@ -4,23 +4,15 @@ import (
 	"database/sql"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
-	"gophergate/internal/db"
-	"gophergate/internal/models"
-	"gophergate/internal/utils"
 	"log/slog"
 
-	"github.com/shirou/gopsutil/v3/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
-	"github.com/shirou/gopsutil/v3/load"
-	"github.com/shirou/gopsutil/v3/mem"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/gin-gonic/gin"
+	"golang.org/x/crypto/bcrypt"
+	"gophergate/internal/db"
+	"gophergate/internal/utils"
 )
 
 type ApiResponse struct {
diff --git a/internal/server/models_config.go b/internal/server/models_config.go
index 3bd98600..6350a3cd 100644
--- a/internal/server/models_config.go
+++ b/internal/server/models_config.go
@@ -1,22 +1,18 @@
 package server
 
 import (
-	"database/sql"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
+	"log/slog"
+
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
 	"gophergate/internal/db"
 	"gophergate/internal/models"
 	"gophergate/internal/utils"
-	"log/slog"
-
-	"github.com/shirou/gopsutil/v3/cpu"
 )
 
 func (s *Server) handleGetModels(c *gin.Context) {
diff --git a/internal/server/providers_admin.go b/internal/server/providers_admin.go
index 2c83aeff..6a7aebbe 100644
--- a/internal/server/providers_admin.go
+++ b/internal/server/providers_admin.go
@@ -1,22 +1,17 @@
 package server
 
 import (
-	"database/sql"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
+	"log/slog"
+
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
 	"gophergate/internal/db"
 	"gophergate/internal/models"
 	"gophergate/internal/utils"
-	"log/slog"
-
-	"github.com/shirou/gopsutil/v3/cpu"
 )
 
 func (s *Server) handleGetProviders(c *gin.Context) {
diff --git a/internal/server/system.go b/internal/server/system.go
index ff94c0e1..34e1e37b 100644
--- a/internal/server/system.go
+++ b/internal/server/system.go
@@ -1,22 +1,23 @@
 package server
 
 import (
-	"database/sql"
 	"fmt"
 	"net/http"
 	"os"
 	"strings"
 	"time"
 
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
-	"gophergate/internal/db"
-	"gophergate/internal/models"
-	"gophergate/internal/utils"
 	"log/slog"
 
+	"github.com/gin-gonic/gin"
+	"gophergate/internal/db"
+	"gophergate/internal/utils"
+
 	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/load"
+	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v3/process"
 )
 
 func (s *Server) handleSystemHealth(c *gin.Context) {
diff --git a/internal/server/users.go b/internal/server/users.go
index abbb2385..a7873d4d 100644
--- a/internal/server/users.go
+++ b/internal/server/users.go
@@ -1,22 +1,14 @@
 package server
 
 import (
-	"database/sql"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"
 	"gophergate/internal/db"
-	"gophergate/internal/models"
-	"gophergate/internal/utils"
-	"log/slog"
-
-	"github.com/shirou/gopsutil/v3/cpu"
 )
 
 func (s *Server) handleGetUsers(c *gin.Context) {