diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/PageTemplatesIT.java b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/PageTemplatesIT.java
index d2992e37121..2237ba0bf28 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/PageTemplatesIT.java
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/PageTemplatesIT.java
@@ -78,7 +78,7 @@ class PageTemplatesIT
     public static final String TEMPLATE_NAME = "TestTemplate";
 
     @BeforeEach
-    public void setup(TestUtils setup)
+    void setup(TestUtils setup)
     {
         setup.loginAsSuperAdmin();
     }
diff --git a/xwiki-platform-core/xwiki-platform-bridge/src/main/java/org/xwiki/bridge/DocumentAccessBridge.java b/xwiki-platform-core/xwiki-platform-bridge/src/main/java/org/xwiki/bridge/DocumentAccessBridge.java
index bd44f0cbbed..d280364f273 100644
--- a/xwiki-platform-core/xwiki-platform-bridge/src/main/java/org/xwiki/bridge/DocumentAccessBridge.java
+++ b/xwiki-platform-core/xwiki-platform-bridge/src/main/java/org/xwiki/bridge/DocumentAccessBridge.java
@@ -190,7 +190,7 @@ default DocumentModelBridge getTranslatedDocumentInstance(EntityReference entity
      * @deprecated replaced by {@link #exists(DocumentReference)} since 2.2.1
      * @throws Exception when failing to check document existence
      */
-    @Deprecated
+    @Deprecated(since = "2.2.1", forRemoval = false)
     boolean exists(String documentReference) throws Exception;
 
     /**
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/src/main/java/org/xwiki/crypto/script/AbstractScriptingStore.java b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/src/main/java/org/xwiki/crypto/script/AbstractScriptingStore.java
index ff68cf012af..cfa5a5679d8 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/src/main/java/org/xwiki/crypto/script/AbstractScriptingStore.java
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/src/main/java/org/xwiki/crypto/script/AbstractScriptingStore.java
@@ -36,12 +36,6 @@
  */
 public abstract class AbstractScriptingStore
 {
-    /**
-     * @deprecated use {@link StandardCharsets#UTF_8} instead
-     */
-    @Deprecated
-    protected static final Charset UTF8 = Charset.forName("UTF-8");
-
     protected StoreReference storeReference;
 
     private ContextualAuthorizationManager contextualAuthorizationManager;