diff --git a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
index 355445810..0c30c6bb2 100644
--- a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
+++ b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
@@ -1,9 +1,9 @@
 package io.codeka.gaia.runner;
 
 import com.github.mustachejava.Mustache;
+import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.settings.bo.Settings;
 import io.codeka.gaia.stacks.bo.Stack;
-import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.stacks.bo.mustache.TerraformScript;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/io/codeka/gaia/runner/StackRunner.java b/src/main/java/io/codeka/gaia/runner/StackRunner.java
index c8b3aa90d..b3d9f62a0 100644
--- a/src/main/java/io/codeka/gaia/runner/StackRunner.java
+++ b/src/main/java/io/codeka/gaia/runner/StackRunner.java
@@ -5,12 +5,12 @@
 import com.spotify.docker.client.messages.ContainerConfig;
 import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.settings.bo.Settings;
-import io.codeka.gaia.stacks.repository.JobRepository;
-import io.codeka.gaia.stacks.repository.StackRepository;
 import io.codeka.gaia.stacks.bo.Job;
 import io.codeka.gaia.stacks.bo.JobType;
 import io.codeka.gaia.stacks.bo.Stack;
 import io.codeka.gaia.stacks.bo.StackState;
+import io.codeka.gaia.stacks.repository.JobRepository;
+import io.codeka.gaia.stacks.repository.StackRepository;
 import org.apache.commons.io.output.WriterOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
diff --git a/src/main/java/io/codeka/gaia/stacks/service/StackCostCalculator.java b/src/main/java/io/codeka/gaia/stacks/service/StackCostCalculator.java
index d9335361c..f3a3afa5c 100644
--- a/src/main/java/io/codeka/gaia/stacks/service/StackCostCalculator.java
+++ b/src/main/java/io/codeka/gaia/stacks/service/StackCostCalculator.java
@@ -1,10 +1,10 @@
 package io.codeka.gaia.stacks.service;
 
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
 import io.codeka.gaia.stacks.bo.JobStatus;
 import io.codeka.gaia.stacks.bo.JobType;
 import io.codeka.gaia.stacks.bo.Stack;
 import io.codeka.gaia.stacks.repository.JobRepository;
-import io.codeka.gaia.modules.repository.TerraformModuleRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/resources/templates/layout/sidebar.html b/src/main/resources/templates/layout/sidebar.html
index b3d321858..a48ba58ba 100644
--- a/src/main/resources/templates/layout/sidebar.html
+++ b/src/main/resources/templates/layout/sidebar.html
@@ -1,5 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org/"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
+<html xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 
 <!-- Sidebar  -->
 <nav id="sidebar">
diff --git a/src/main/resources/templates/layout/topbar.html b/src/main/resources/templates/layout/topbar.html
index 0c6642c9e..2a500b92c 100644
--- a/src/main/resources/templates/layout/topbar.html
+++ b/src/main/resources/templates/layout/topbar.html
@@ -1,5 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org/"
-        xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
+<html xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 
 <div class="topbar">
     <nav class="navbar navbar-expand-lg navbar-light">
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index 6ecce51b5..967eafd75 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:replace="layout/header :: header(~{::title})">
 
     <title>Gaia - Users</title>
diff --git a/src/test/java/io/codeka/gaia/runner/DockerContainerTest.java b/src/test/java/io/codeka/gaia/runner/DockerContainerTest.java
index 349171437..b08fa523e 100644
--- a/src/test/java/io/codeka/gaia/runner/DockerContainerTest.java
+++ b/src/test/java/io/codeka/gaia/runner/DockerContainerTest.java
@@ -4,11 +4,8 @@
 import com.spotify.docker.client.LogStream;
 import com.spotify.docker.client.exceptions.DockerException;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -16,7 +13,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
diff --git a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
index f2eb51171..d7350240a 100644
--- a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
+++ b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
@@ -2,10 +2,10 @@
 
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.Mustache;
-import io.codeka.gaia.settings.bo.Settings;
-import io.codeka.gaia.stacks.bo.Stack;
 import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.modules.bo.TerraformVariable;
+import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.stacks.bo.Stack;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java b/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
index 16b6d4d08..669c7b0bd 100644
--- a/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
+++ b/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
@@ -7,9 +7,9 @@
 import com.spotify.docker.client.messages.ContainerExit;
 import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.stacks.bo.*;
 import io.codeka.gaia.stacks.repository.JobRepository;
 import io.codeka.gaia.stacks.repository.StackRepository;
-import io.codeka.gaia.stacks.bo.*;
 import io.codeka.gaia.teams.bo.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java b/src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java
index 42bea8a37..937b2c608 100644
--- a/src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java
+++ b/src/test/java/io/codeka/gaia/settings/bo/SettingsTest.java
@@ -1,6 +1,5 @@
 package io.codeka.gaia.settings.bo;
 
-import io.codeka.gaia.settings.bo.Settings;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -11,7 +10,8 @@
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest(classes = Settings.class)
 @EnableConfigurationProperties
diff --git a/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java b/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java
index 9029639dc..2c21ec8b0 100644
--- a/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java
+++ b/src/test/java/io/codeka/gaia/settings/repository/SettingsRepositoryIT.java
@@ -12,7 +12,7 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @SpringBootTest
 @Testcontainers
diff --git a/src/test/java/io/codeka/gaia/stacks/bo/JobTest.java b/src/test/java/io/codeka/gaia/stacks/bo/JobTest.java
index 3c08b6b3f..b39c160f9 100644
--- a/src/test/java/io/codeka/gaia/stacks/bo/JobTest.java
+++ b/src/test/java/io/codeka/gaia/stacks/bo/JobTest.java
@@ -1,8 +1,5 @@
 package io.codeka.gaia.stacks.bo;
 
-import io.codeka.gaia.stacks.bo.Job;
-import io.codeka.gaia.stacks.bo.JobStatus;
-import io.codeka.gaia.stacks.bo.JobType;
 import io.codeka.gaia.teams.bo.User;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/io/codeka/gaia/stacks/controller/JobRestControllerTest.java b/src/test/java/io/codeka/gaia/stacks/controller/JobRestControllerTest.java
index 50c2bdbbb..69b3f57ec 100644
--- a/src/test/java/io/codeka/gaia/stacks/controller/JobRestControllerTest.java
+++ b/src/test/java/io/codeka/gaia/stacks/controller/JobRestControllerTest.java
@@ -2,8 +2,6 @@
 
 import io.codeka.gaia.stacks.bo.Job;
 import io.codeka.gaia.stacks.repository.JobRepository;
-import io.codeka.gaia.stacks.controller.JobNotFoundException;
-import io.codeka.gaia.stacks.controller.JobRestController;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -12,7 +10,7 @@
 
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/src/test/java/io/codeka/gaia/stacks/controller/StackControllerTest.java b/src/test/java/io/codeka/gaia/stacks/controller/StackControllerTest.java
index 434ea8bd2..4877f38cc 100644
--- a/src/test/java/io/codeka/gaia/stacks/controller/StackControllerTest.java
+++ b/src/test/java/io/codeka/gaia/stacks/controller/StackControllerTest.java
@@ -1,13 +1,12 @@
 package io.codeka.gaia.stacks.controller;
 
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
+import io.codeka.gaia.runner.StackRunner;
 import io.codeka.gaia.stacks.bo.Job;
 import io.codeka.gaia.stacks.bo.Stack;
-import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.stacks.repository.JobRepository;
 import io.codeka.gaia.stacks.repository.StackRepository;
-import io.codeka.gaia.modules.repository.TerraformModuleRepository;
-import io.codeka.gaia.runner.StackRunner;
-import io.codeka.gaia.stacks.controller.StackController;
 import io.codeka.gaia.teams.bo.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerTest.java b/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerTest.java
index 56e87cd28..90503f01a 100644
--- a/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerTest.java
+++ b/src/test/java/io/codeka/gaia/stacks/controller/StackRestControllerTest.java
@@ -16,9 +16,7 @@
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/src/test/java/io/codeka/gaia/stacks/repository/JobRepositoryIT.java b/src/test/java/io/codeka/gaia/stacks/repository/JobRepositoryIT.java
index c9eb8e1f1..8b133dd22 100644
--- a/src/test/java/io/codeka/gaia/stacks/repository/JobRepositoryIT.java
+++ b/src/test/java/io/codeka/gaia/stacks/repository/JobRepositoryIT.java
@@ -2,7 +2,6 @@
 
 import io.codeka.gaia.stacks.bo.Job;
 import io.codeka.gaia.stacks.bo.JobStatus;
-import io.codeka.gaia.stacks.repository.JobRepository;
 import io.codeka.gaia.teams.bo.User;
 import io.codeka.gaia.teams.repository.UserRepository;
 import io.codeka.gaia.test.MongoContainer;
diff --git a/src/test/java/io/codeka/gaia/stacks/repository/StackRepositoryIT.java b/src/test/java/io/codeka/gaia/stacks/repository/StackRepositoryIT.java
index 5576fd3af..ed2530b72 100644
--- a/src/test/java/io/codeka/gaia/stacks/repository/StackRepositoryIT.java
+++ b/src/test/java/io/codeka/gaia/stacks/repository/StackRepositoryIT.java
@@ -2,7 +2,6 @@
 
 import io.codeka.gaia.stacks.bo.Stack;
 import io.codeka.gaia.stacks.bo.StackState;
-import io.codeka.gaia.stacks.repository.StackRepository;
 import io.codeka.gaia.teams.bo.Team;
 import io.codeka.gaia.test.MongoContainer;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/io/codeka/gaia/stacks/service/StackCostCalculatorTest.java b/src/test/java/io/codeka/gaia/stacks/service/StackCostCalculatorTest.java
index 53d897b83..7643a6001 100644
--- a/src/test/java/io/codeka/gaia/stacks/service/StackCostCalculatorTest.java
+++ b/src/test/java/io/codeka/gaia/stacks/service/StackCostCalculatorTest.java
@@ -1,11 +1,11 @@
 package io.codeka.gaia.stacks.service;
 
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.modules.repository.TerraformModuleRepository;
 import io.codeka.gaia.stacks.bo.Job;
 import io.codeka.gaia.stacks.bo.JobType;
 import io.codeka.gaia.stacks.bo.Stack;
-import io.codeka.gaia.modules.bo.TerraformModule;
 import io.codeka.gaia.stacks.repository.JobRepository;
-import io.codeka.gaia.modules.repository.TerraformModuleRepository;
 import io.codeka.gaia.teams.bo.User;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/io/codeka/gaia/teams/controller/TeamsRestControllerTest.java b/src/test/java/io/codeka/gaia/teams/controller/TeamsRestControllerTest.java
index b2e1231dd..40d7a8fb4 100644
--- a/src/test/java/io/codeka/gaia/teams/controller/TeamsRestControllerTest.java
+++ b/src/test/java/io/codeka/gaia/teams/controller/TeamsRestControllerTest.java
@@ -6,13 +6,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/src/test/java/io/codeka/gaia/teams/controller/UserControllerAdviceTest.java b/src/test/java/io/codeka/gaia/teams/controller/UserControllerAdviceTest.java
index 6a308100b..5193642fb 100644
--- a/src/test/java/io/codeka/gaia/teams/controller/UserControllerAdviceTest.java
+++ b/src/test/java/io/codeka/gaia/teams/controller/UserControllerAdviceTest.java
@@ -9,12 +9,9 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.core.Authentication;
 
-import javax.swing.text.html.Option;
-
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/src/test/java/io/codeka/gaia/teams/controller/UsersRestControllerTest.java b/src/test/java/io/codeka/gaia/teams/controller/UsersRestControllerTest.java
index 6d39b2d75..1d2466499 100644
--- a/src/test/java/io/codeka/gaia/teams/controller/UsersRestControllerTest.java
+++ b/src/test/java/io/codeka/gaia/teams/controller/UsersRestControllerTest.java
@@ -1,7 +1,6 @@
 package io.codeka.gaia.teams.controller;
 
 import io.codeka.gaia.teams.bo.User;
-import io.codeka.gaia.teams.repository.TeamRepository;
 import io.codeka.gaia.teams.repository.UserRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/io/codeka/gaia/teams/repository/UserRepositoryTest.java b/src/test/java/io/codeka/gaia/teams/repository/UserRepositoryTest.java
index 67acf2550..77b0ae6f8 100644
--- a/src/test/java/io/codeka/gaia/teams/repository/UserRepositoryTest.java
+++ b/src/test/java/io/codeka/gaia/teams/repository/UserRepositoryTest.java
@@ -5,15 +5,11 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.test.annotation.DirtiesContext;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import java.util.Optional;
-
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 
 @DataMongoTest
 @Testcontainers
