diff --git a/src/Admin/BlockAdmin.php b/src/Admin/BlockAdmin.php
index 3acdb085e..f72d94fed 100644
--- a/src/Admin/BlockAdmin.php
+++ b/src/Admin/BlockAdmin.php
@@ -22,7 +22,6 @@
 use Sonata\BlockBundle\Block\Service\EditableBlockService;
 use Sonata\BlockBundle\Form\Type\ServiceListType;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\PageBundle\Mapper\PageFormMapper;
 use Sonata\PageBundle\Model\PageBlockInterface;
 use Sonata\PageBundle\Model\PageInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -232,12 +231,10 @@ private function configureBlockFields(FormMapper $form, BlockInterface $block):
             ));
         }
 
-        $blockMapper = new PageFormMapper($form);
-
         if ($block->getId() > 0) {
-            $service->configureEditForm($blockMapper, $block);
+            $service->configureEditForm($form, $block);
         } else {
-            $service->configureCreateForm($blockMapper, $block);
+            $service->configureCreateForm($form, $block);
         }
 
         if ($form->has('settings') && isset($this->blocks[$blockType]['templates'])) {
diff --git a/src/Admin/SharedBlockAdmin.php b/src/Admin/SharedBlockAdmin.php
index 53cf3c85a..e412b9d48 100644
--- a/src/Admin/SharedBlockAdmin.php
+++ b/src/Admin/SharedBlockAdmin.php
@@ -19,7 +19,6 @@
 use Sonata\BlockBundle\Block\Service\EditableBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
-use Sonata\PageBundle\Mapper\PageFormMapper;
 use Sonata\PageBundle\Model\PageBlockInterface;
 
 /**
@@ -103,12 +102,10 @@ private function configureBlockFields(FormMapper $form, BlockInterface $block):
             ));
         }
 
-        $blockMapper = new PageFormMapper($form);
-
         if ($block->getId() > 0) {
-            $service->configureEditForm($blockMapper, $block);
+            $service->configureEditForm($form, $block);
         } else {
-            $service->configureCreateForm($blockMapper, $block);
+            $service->configureCreateForm($form, $block);
         }
     }
 }
diff --git a/src/Mapper/PageFormMapper.php b/src/Mapper/PageFormMapper.php
deleted file mode 100644
index 826a9c4f5..000000000
--- a/src/Mapper/PageFormMapper.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the Sonata Project package.
- *
- * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Sonata\PageBundle\Mapper;
-
-use Sonata\AdminBundle\Form\FormMapper as AdminFormMapper;
-use Sonata\BlockBundle\Form\Mapper\FormMapper;
-use Symfony\Component\Form\FormBuilderInterface;
-
-/**
- * @phpstan-template T of object
- */
-final class PageFormMapper implements FormMapper
-{
-    /**
-     * @var AdminFormMapper<T>
-     */
-    private AdminFormMapper $adminFormMapper;
-
-    /**
-     * @param AdminFormMapper<T> $adminFormMapper
-     */
-    public function __construct(AdminFormMapper $adminFormMapper)
-    {
-        $this->adminFormMapper = $adminFormMapper;
-    }
-
-    public function create(string $name, ?string $type = null, array $options = []): FormBuilderInterface
-    {
-        return $this->adminFormMapper->create($name, $type, $options);
-    }
-
-    public function reorder(array $keys): FormMapper
-    {
-        $this->adminFormMapper->reorder($keys);
-
-        return $this;
-    }
-
-    public function add(string $name, ?string $type = null, array $options = []): FormMapper
-    {
-        $this->adminFormMapper->add($name, $type, $options);
-
-        return $this;
-    }
-
-    public function remove(string $key): FormMapper
-    {
-        $this->adminFormMapper->remove($key);
-
-        return $this;
-    }
-
-    public function has(string $key): bool
-    {
-        return $this->adminFormMapper->has($key);
-    }
-
-    public function get(string $key): FormBuilderInterface
-    {
-        return $this->adminFormMapper->get($key);
-    }
-}