diff --git a/docs/tutorial/IndexerService.md b/docs/tutorial/IndexerService.md
index 149fb05a993a0464e724faaf25373f88058c9116..b6d8e858e1e934cc9bab01ac54ef62b619264594 100644
--- a/docs/tutorial/IndexerService.md
+++ b/docs/tutorial/IndexerService.md
@@ -4,6 +4,8 @@
 
 - [Indexer service](#indexer-service)
 - [Introduction](#introduction)
+- [Features](#features)
+  - [Geoshape Decimation](#geoshape-decimation)
 - [Indexer API access](#indexer-api-access)
 - [API Reference](#api-reference)
   - [Version info endpoint](#version-info-endpoint)
@@ -23,6 +25,20 @@ The indexer is indexes attributes defined in the schema. Schema can be created a
 via Schema Service. The Indexer service also adds number of OSDU Data Platform meta attributes such as id, kind,
 parent, acl, namespace, type, version, legaltags, index to each record at the time of indexing.
 
+## Features <a name="features"></a>
+
+### Geoshape Decimation <a name="geoshape-decimation"></a>
+
+In order to improve indexing and search performance for documents with large geometry, the geo-shape of the following
+GeoJSON types in the original shape attribute and virtual shape attribute if exists are decimated
+by implementing Ramer–Douglas–Peucker algorithm:
+- LineString
+- MultiLineString
+- Polygon
+- MultiPolygon
+
+The feature is enabled for all data partitions since M19.
+
 ## Indexer API access <a name="indexer-api-access"></a>
 
 - Required roles
diff --git a/docs/tutorial/PreviewFeatures.md b/docs/tutorial/PreviewFeatures.md
index 16981af3b7af845d163f9288ff738503423b070d..bdc3dc8800c05ebd64c937911452c8dbd74a2a54 100644
--- a/docs/tutorial/PreviewFeatures.md
+++ b/docs/tutorial/PreviewFeatures.md
@@ -1,28 +1,14 @@
 ## Geoshape Decimation
 
-In order to improve indexing and search performance for documents with large geometry, the geo-shape of the following 
-GeoJSON types in the original shape attribute and virtual shape attribute if exists are decimated 
+In order to improve indexing and search performance for documents with large geometry, the geo-shape of the following
+GeoJSON types in the original shape attribute and virtual shape attribute if exists are decimated
 by implementing Ramer–Douglas–Peucker algorithm:
 - LineString
 - MultiLineString
 - Polygon
-- MultiPolygon  
+- MultiPolygon
 
-
-The feature is enabled by default for all data partitions. If client does not want the geo-shape to be decimated in their
-data partitions, they can disable geo-shape decimation through the Partition Service.  
-Here is an example to disable this feature by setting the property "indexer-decimation-enabled" in a given data partition:
-```
-{
-   "indexer-decimation-enabled": {
-        "sensitive": false,
-        "value": "false"
-    }
-}
-```
-
-If the property "indexer-decimation-enabled" is not created or the property value is set to "true" (String type) in the 
-given data partition, the geo-shape decimation will be enabled.
+The feature is enabled for all data partitions since M19.
 
 ## Index extension
 
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/geo/decimator/FeatureFlagCache.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/cache/FeatureFlagCache.java
similarity index 94%
rename from indexer-core/src/main/java/org/opengroup/osdu/indexer/util/geo/decimator/FeatureFlagCache.java
rename to indexer-core/src/main/java/org/opengroup/osdu/indexer/cache/FeatureFlagCache.java
index c24d200b7ce3452c89304213d69f0cde47112a9a..d57a5dbffda83a72c785a692da47d0bb3b756b64 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/geo/decimator/FeatureFlagCache.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/cache/FeatureFlagCache.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.opengroup.osdu.indexer.util.geo.decimator;
+package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.cache.VmCache;
 import org.springframework.stereotype.Component;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java
index d949e581fa000842f1d48ce91cec1b08164cecbb..bba17ba3e2748270af062067688ef4378880e433 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java
@@ -33,7 +33,6 @@ import org.opengroup.osdu.indexer.schema.converter.tags.VirtualProperty;
 import org.opengroup.osdu.indexer.util.PropertyUtil;
 import org.opengroup.osdu.indexer.util.geo.decimator.DecimatedResult;
 import org.opengroup.osdu.indexer.util.geo.decimator.GeoShapeDecimator;
-import org.opengroup.osdu.indexer.util.geo.decimator.GeoShapeDecimationSetting;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
@@ -58,8 +57,6 @@ public class StorageIndexerPayloadMapper {
     private IVirtualPropertiesSchemaCache virtualPropertiesSchemaCache;
     @Inject
     private GeoShapeDecimator decimator;
-    @Inject
-    private GeoShapeDecimationSetting decimationSetting;
 
     public Map<String, Object> mapDataPayload(IndexSchema storageSchema, Map<String, Object> storageRecordData,
                                               String recordId) {
@@ -245,7 +242,7 @@ public class StorageIndexerPayloadMapper {
         // No VirtualProperties.DefaultLocation.Wgs84Coordinates defined, use the default geo-shape property
         if (originalGeoShapeProperty == null)
             originalGeoShapeProperty = getDefaultGeoShapeProperty(dataCollectorMap);
-        if(originalGeoShapeProperty != null && decimationSetting.isDecimationEnabled()) {
+        if(originalGeoShapeProperty != null) {
             try {
                 decimateGeoShape(originalGeoShapeProperty, dataCollectorMap);
             } catch (JsonProcessingException ex) {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClient.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClient.java
index a27ec91cd02d9bb54060e8509ec470512b7bd36d..f21e0968d976de22c1f2f35daf4e33b17cbe7406 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClient.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClient.java
@@ -4,7 +4,7 @@ import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.partition.*;
 import org.opengroup.osdu.core.common.util.IServiceAccountJwtClient;
-import org.opengroup.osdu.indexer.util.geo.decimator.FeatureFlagCache;
+import org.opengroup.osdu.indexer.cache.FeatureFlagCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -49,7 +49,7 @@ public class BooleanFeatureFlagClient {
     private PartitionInfo getPartitionInfo(String dataPartitionId) throws PartitionException {
         try {
             DpsHeaders partitionHeaders = DpsHeaders.createFromMap(headers.getHeaders());
-            partitionHeaders.put(DpsHeaders.AUTHORIZATION, this.getAuthorization(dataPartitionId));
+            partitionHeaders.put(DpsHeaders.AUTHORIZATION, this.tokenService.getIdToken(dataPartitionId));
 
             IPartitionProvider partitionProvider = this.factory.create(partitionHeaders);
             PartitionInfo partitionInfo = partitionProvider.get(dataPartitionId);
@@ -60,14 +60,6 @@ public class BooleanFeatureFlagClient {
         }
     }
 
-    private String getAuthorization(String dataPartitionId) {
-        String authorization = this.tokenService.getIdToken(dataPartitionId);
-        if(!authorization.startsWith(TOKEN_PREFIX)) {
-            authorization = TOKEN_PREFIX + authorization;
-        }
-        return authorization;
-    }
-
     private boolean getFeatureValue(PartitionInfo partitionInfo, String featureName, boolean defaultValue) {
         if(partitionInfo == null || partitionInfo.getProperties() == null)
             return defaultValue;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/geo/decimator/GeoShapeDecimationSetting.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/geo/decimator/GeoShapeDecimationSetting.java
deleted file mode 100644
index ddab10f0180684167776593c5b064816dadd84e5..0000000000000000000000000000000000000000
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/geo/decimator/GeoShapeDecimationSetting.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright © Schlumberger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.opengroup.osdu.indexer.util.geo.decimator;
-
-import org.opengroup.osdu.indexer.util.BooleanFeatureFlagClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GeoShapeDecimationSetting {
-    private static final String PROPERTY_NAME =  "indexer-decimation-enabled";
-
-    @Autowired
-    private BooleanFeatureFlagClient booleanFeatureFlagClient;
-
-    public boolean isDecimationEnabled() {
-        return booleanFeatureFlagClient.isEnabled(PROPERTY_NAME, true);
-    }
-}
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/geo/decimator/DecimationSettingCacheTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/cache/FeatureFlagCacheTest.java
similarity index 90%
rename from indexer-core/src/test/java/org/opengroup/osdu/indexer/util/geo/decimator/DecimationSettingCacheTest.java
rename to indexer-core/src/test/java/org/opengroup/osdu/indexer/cache/FeatureFlagCacheTest.java
index c32159b5e1186cefa6f72e4bc478d4095aa97bc9..b440c049d04c7575df51732a1c8f83aad8fe5f1a 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/geo/decimator/DecimationSettingCacheTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/cache/FeatureFlagCacheTest.java
@@ -13,16 +13,17 @@
  * limitations under the License.
  */
 
-package org.opengroup.osdu.indexer.util.geo.decimator;
+package org.opengroup.osdu.indexer.cache;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.opengroup.osdu.indexer.cache.FeatureFlagCache;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-public class DecimationSettingCacheTest {
+public class FeatureFlagCacheTest {
     private static final String VALID_KEY = "Tenant1-indexer-decimation-enabled";
     private static final String INVALID_KEY = "Tenant2-indexer-decimation-enabled";
     FeatureFlagCache cache;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapperTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapperTest.java
index f11d6cb80a2b258d742bf13e26d2e2ee62dabfa8..b56339a96f294e8c8035d7844354cf885a7f1f2d 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapperTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapperTest.java
@@ -12,16 +12,14 @@ import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
+import org.opengroup.osdu.indexer.cache.FeatureFlagCache;
 import org.opengroup.osdu.indexer.schema.converter.config.SchemaConverterPropertiesConfig;
 import org.opengroup.osdu.indexer.schema.converter.exeption.SchemaProcessingException;
 import org.opengroup.osdu.indexer.schema.converter.interfaces.IVirtualPropertiesSchemaCache;
 import org.opengroup.osdu.indexer.schema.converter.tags.SchemaRoot;
 import org.opengroup.osdu.indexer.schema.converter.tags.VirtualProperties;
-import org.opengroup.osdu.indexer.service.mock.PartitionFactoryMock;
-import org.opengroup.osdu.indexer.service.mock.PartitionProviderMock;
 import org.opengroup.osdu.indexer.service.mock.ServiceAccountJwtClientMock;
 import org.opengroup.osdu.indexer.service.mock.VirtualPropertiesSchemaCacheMock;
-import org.opengroup.osdu.indexer.util.BooleanFeatureFlagClient;
 import org.opengroup.osdu.indexer.util.geo.decimator.*;
 import org.opengroup.osdu.indexer.util.parser.BooleanParser;
 import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
@@ -32,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.inject.Inject;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -47,8 +44,8 @@ import static org.junit.Assert.*;
 @SpringBootTest(classes = {StorageIndexerPayloadMapper.class, AttributeParsingServiceImpl.class, NumberParser.class,
         BooleanParser.class, DateTimeParser.class, GeoShapeParser.class, DouglasPeuckerReducer.class, GeoShapeDecimator.class,
         GeometryDecimator.class, GeometryConversionService.class, FeatureFlagCache.class,
-        GeoShapeDecimationSetting.class, BooleanFeatureFlagClient.class,DpsHeaders.class, JobStatus.class, SchemaConverterPropertiesConfig.class, JaxRsDpsLog.class,
-        PartitionFactoryMock.class, PartitionProviderMock.class, ServiceAccountJwtClientMock.class, VirtualPropertiesSchemaCacheMock.class, })
+        DpsHeaders.class, JobStatus.class, SchemaConverterPropertiesConfig.class, JaxRsDpsLog.class,
+        ServiceAccountJwtClientMock.class, VirtualPropertiesSchemaCacheMock.class, })
 public class StorageIndexerPayloadMapperTest {
 
     public static final String FIRST_OBJECT_INNER_PROPERTY = "FirstObjectInnerProperty";
@@ -78,9 +75,6 @@ public class StorageIndexerPayloadMapperTest {
     @Autowired
     private IVirtualPropertiesSchemaCache virtualPropertiesSchemaCache;
 
-    @Inject
-    private GeoShapeDecimationSetting decimationSetting;
-
     @BeforeClass
     public static void setUp() {
         HashMap<String, Object> dataMap = new HashMap<>();
@@ -206,11 +200,6 @@ public class StorageIndexerPayloadMapperTest {
         assertNull(dataCollectorMap.get("VirtualProperties.DefaultName"));
     }
 
-    @Test
-    public void geoshape_decimation_is_enabled_by_default() {
-        assertTrue(decimationSetting.isDecimationEnabled());
-    }
-
     @Test
     public void geoshape_decimation_is_executed_with_virtual_spatial_location() {
         final String kind = "osdu:wks:master-data--SeismicAcquisitionSurvey:1.0.0";
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/mock/PartitionFactoryMock.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/mock/PartitionFactoryMock.java
deleted file mode 100644
index dbe1ee22b0020d99eff0cc1b585c48400ce958e8..0000000000000000000000000000000000000000
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/mock/PartitionFactoryMock.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright © Schlumberger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.opengroup.osdu.indexer.service.mock;
-
-import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.opengroup.osdu.core.common.partition.IPartitionFactory;
-import org.opengroup.osdu.core.common.partition.IPartitionProvider;
-
-public class PartitionFactoryMock implements IPartitionFactory {
-    @Override
-    public IPartitionProvider create(DpsHeaders dpsHeaders) {
-        return new PartitionProviderMock();
-    }
-}
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/mock/PartitionProviderMock.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/mock/PartitionProviderMock.java
deleted file mode 100644
index 55767e8fd7841b2e1e9063fc240dab0cae6b8f22..0000000000000000000000000000000000000000
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/mock/PartitionProviderMock.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright © Schlumberger
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.opengroup.osdu.indexer.service.mock;
-
-import org.opengroup.osdu.core.common.partition.IPartitionProvider;
-import org.opengroup.osdu.core.common.partition.PartitionException;
-import org.opengroup.osdu.core.common.partition.PartitionInfo;
-import org.opengroup.osdu.core.common.partition.Property;
-
-import java.util.List;
-
-public class PartitionProviderMock implements IPartitionProvider {
-    private static final String PROPERTY_NAME =  "indexer-decimation-enabled";
-
-    @Override
-    public PartitionInfo get(String s) throws PartitionException {
-        PartitionInfo partitionInfo = new PartitionInfo();
-        Property property = new Property();
-        property.setSensitive(false);
-        property.setValue("true");
-        partitionInfo.getProperties().put(PROPERTY_NAME, property);
-        return partitionInfo;
-    }
-
-    @Override
-    public PartitionInfo create(String s, PartitionInfo partitionInfo) throws PartitionException {
-        return null;
-    }
-
-    @Override
-    public void update(String s, PartitionInfo partitionInfo) throws PartitionException {
-
-    }
-
-    @Override
-    public void delete(String s) throws PartitionException {
-
-    }
-
-    @Override
-    public List<String> list() throws PartitionException {
-        return null;
-    }
-}
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClientTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClientTest.java
index 10e73df399a9ba64b858c121df5e7ad365e2fbcd..8b5fb420f4e1269ddcb0bd255a535a172869056d 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClientTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/BooleanFeatureFlagClientTest.java
@@ -25,7 +25,7 @@ import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.partition.*;
 import org.opengroup.osdu.core.common.util.IServiceAccountJwtClient;
-import org.opengroup.osdu.indexer.util.geo.decimator.FeatureFlagCache;
+import org.opengroup.osdu.indexer.cache.FeatureFlagCache;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.HashMap;