diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Context.java b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Context.java
index 04c89bf1cc9d..f9f6c9da58b0 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Context.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/proc/Context.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.exceptions.ProcedureException;
-import org.neo4j.kernel.api.security.AuthSubject;
 import org.neo4j.kernel.api.security.SecurityContext;
 
 /**
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
index d36e013e57c9..6d4e65f7abc5 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
@@ -371,8 +371,6 @@ private Procedures setupProcedures( PlatformModule platform, EditionModule editi
         Guard guard = platform.dependencies.resolveDependency( Guard.class );
         procedures.registerComponent( TerminationGuard.class, new TerminationGuardProvider( guard ), true );
 
-        // Register injected private API components: useful to have available in procedures to access the kernel etc.
-
         // Below components are not public API, but are made available for internal
         // procedures to call, and to provide temporary workarounds for the following
         // patterns:
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java
index 2e2c23327e65..dcf56ac40480 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java
@@ -182,7 +182,7 @@ public void shutdown()
     }
 
     @Override
-    public KernelTransaction beginTransaction( KernelTransaction.Type type, SecurityContext securityContext, long timeout )
+    public KernelTransaction beginTransaction( KernelTransaction.Type type, SecurityContext ignoredSecurityContext, long timeout )
     {
         try
         {
diff --git a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
index 41cc056724ae..d5bcb582f9a7 100644
--- a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
+++ b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
@@ -37,12 +37,10 @@
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.neo4j.function.Predicates;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -53,7 +51,6 @@
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.security.AuthorizationViolationException;
-import org.neo4j.helpers.Exceptions;
 import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.io.fs.FileUtils;
 import org.neo4j.kernel.api.KernelTransaction;
@@ -68,7 +65,6 @@
 
 import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -824,7 +820,7 @@ public void shouldBeAbleToSpawnThreadsCreatingTransactionInProcedures() throws T
     {
         // given
         Runnable doIt = () -> {
-            Result result = db.execute( "CALL org.neo4j.procedure.unsupportedProcedure()" );
+            Result result = db.execute( "CALL org.neo4j.procedure.supportedProcedure()" );
             while ( result.hasNext() )
             {
                 result.next();
@@ -1539,7 +1535,7 @@ public void delegatingSideEffect( @Name( "value" ) String value )
         }
 
         @Procedure( mode = WRITE )
-        public void unsupportedProcedure()
+        public void supportedProcedure()
         {
             jobs.submit( () -> {
                 try ( Transaction tx = db.beginTx() )