diff --git a/src/MyMemoryFilter.php b/src/MyMemoryFilter.php
index 72e84ab..70008d3 100644
--- a/src/MyMemoryFilter.php
+++ b/src/MyMemoryFilter.php
@@ -26,7 +26,6 @@
 use Matecat\SubFiltering\Filters\RestoreXliffTagsContent;
 use Matecat\SubFiltering\Filters\RestoreXliffTagsInXliff;
 use Matecat\SubFiltering\Filters\RubyOnRailsI18n;
-use Matecat\SubFiltering\Filters\SingleCurlyBracketsToPh;
 use Matecat\SubFiltering\Filters\SmartCounts;
 use Matecat\SubFiltering\Filters\Snails;
 use Matecat\SubFiltering\Filters\SplitPlaceholder;
@@ -86,10 +85,6 @@ public function fromLayer0ToLayer1( $segment, $cid = null ) {
         $channel->addLast( new RestoreXliffTagsContent() );
         $channel->addLast( new RestorePlaceHoldersToXLIFFLtGt() );
 
-        if ( $cid == 'uber' ) {
-            $channel->addAfter( new TwigToPh(), new SingleCurlyBracketsToPh() );
-        }
-
         return $channel->transform( $segment );
 
     }
diff --git a/tests/MateCatSubFilteringTest.php b/tests/MateCatSubFilteringTest.php
index e5096b3..d7cab42 100644
--- a/tests/MateCatSubFilteringTest.php
+++ b/tests/MateCatSubFilteringTest.php
@@ -10,7 +10,6 @@
 use Matecat\SubFiltering\Filters\TwigToPh;
 use Matecat\SubFiltering\MateCatFilter;
 use Matecat\SubFiltering\Tests\Mocks\Features\AirbnbFeature;
-use Matecat\SubFiltering\Tests\Mocks\Features\UberFeature;
 use Matecat\SubFiltering\Tests\Mocks\FeatureSet;
 use Matecat\SubFiltering\Utils\CatUtils;
 use PHPUnit\Framework\TestCase;
@@ -783,21 +782,6 @@ public function testSmartCount() {
      **************************
      */
 
-    public function testWithUberPipeline() {
-        $Filter = MateCatFilter::getInstance( new FeatureSet( [ new UberFeature() ] ), 'en-EN', 'et-ET', [] );
-
-        $db_segment          = 'Ciao questo è una prova {RIDER}. { RIDER } non viene bloccato.';
-        $expected_l1_segment = 'Ciao questo è una prova <ph id="mtc_1" ctype="' . CTypeEnum::CURLY_BRACKETS . '" equiv-text="base64:e1JJREVSfQ=="/>. { RIDER } non viene bloccato.';
-
-        $l1_segment = $Filter->fromLayer0ToLayer1( $db_segment );
-
-        $this->assertEquals( $l1_segment, $expected_l1_segment );
-
-        $back_to_db_segment = $Filter->fromLayer1ToLayer0( $l1_segment );
-
-        $this->assertEquals( $back_to_db_segment, $db_segment );
-    }
-
     /**
      * Test for skyscanner
      * (promoted to global behavior)
diff --git a/tests/Mocks/Features/UberFeature.php b/tests/Mocks/Features/UberFeature.php
deleted file mode 100644
index 71560d9..0000000
--- a/tests/Mocks/Features/UberFeature.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Matecat\SubFiltering\Tests\Mocks\Features;
-
-use Matecat\SubFiltering\Commons\Pipeline;
-use Matecat\SubFiltering\Filters\HtmlToPh;
-use Matecat\SubFiltering\Filters\SingleCurlyBracketsToPh;
-use Matecat\SubFiltering\Filters\TwigToPh;
-
-class UberFeature extends BaseFeature
-{
-    /**
-     * Override default fromLayer0ToLayer1
-     *
-     * @param Pipeline $channel
-     *
-     * @return Pipeline
-     */
-    public function fromLayer0ToLayer1(Pipeline $channel)
-    {
-        $channel->addAfter( new HtmlToPh(), new SingleCurlyBracketsToPh() );
-        $channel->remove(new TwigToPh());
-
-        return $channel;
-    }
-}
\ No newline at end of file
diff --git a/tests/MyMemorySubFilteringTest.php b/tests/MyMemorySubFilteringTest.php
index e9403b2..1f7a156 100644
--- a/tests/MyMemorySubFilteringTest.php
+++ b/tests/MyMemorySubFilteringTest.php
@@ -229,10 +229,8 @@ public function testWithSquareSprintf() {
             '[%.222f:name]',
             '[%.2f:placeholder]',
             '[%.2f:place_holder]',
-            '[%key_id:key_id%]',
             '[%key_id:1234%]',
             '[%test:1234%]',
-            '[%test:test%]',
         ];
 
         foreach ($tags as $tag){