LPD-64047 This is really not needed as the ff already disables the service tracker

Author: 4lejandrito

modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/AccountGroupResourceImpl.java

@@ -29,7 +29,6 @@
 import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.search.Field;
 import com.liferay.portal.kernel.search.Sort;
 import com.liferay.portal.kernel.search.filter.Filter;
@@ -213,13 +212,7 @@ public List<String> getNestedFields() {
 
 			@Override
 			public String getPortletId() {
-				if (FeatureFlagManagerUtil.isEnabled(
-						CompanyConstants.SYSTEM, "LPD-35914")) {
-
-					return AccountPortletKeys.ACCOUNT_GROUPS_ADMIN;
-				}
-
-				return null;
+				return AccountPortletKeys.ACCOUNT_GROUPS_ADMIN;
 			}
 
 			@Override

modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/AccountResourceImpl.java

@@ -51,7 +51,6 @@
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.model.Address;
-import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.model.Contact;
 import com.liferay.portal.kernel.model.EmailAddress;
 import com.liferay.portal.kernel.model.Group;
@@ -328,13 +327,7 @@ public List<String> getNestedFields() {
 
 			@Override
 			public String getPortletId() {
-				if (FeatureFlagManagerUtil.isEnabled(
-						CompanyConstants.SYSTEM, "LPD-35914")) {
-
-					return AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN;
-				}
-
-				return null;
+				return AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN;
 			}
 
 			@Override

modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/OrganizationResourceImpl.java

@@ -47,7 +47,6 @@
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.model.Address;
-import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.model.Group;
 import com.liferay.portal.kernel.model.ListTypeConstants;
 import com.liferay.portal.kernel.model.OrgLabor;
@@ -316,13 +315,7 @@ public Map<String, Serializable> getParameters() {
 
 			@Override
 			public String getPortletId() {
-				if (FeatureFlagManagerUtil.isEnabled(
-						CompanyConstants.SYSTEM, "LPD-35914")) {
-
-					return UsersAdminPortletKeys.ORGANIZATIONS_ADMIN;
-				}
-
-				return null;
+				return UsersAdminPortletKeys.ORGANIZATIONS_ADMIN;
 			}
 
 			@Override

modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/RoleResourceImpl.java

@@ -15,7 +15,6 @@
 import com.liferay.portal.kernel.exception.NoSuchRoleException;
 import com.liferay.portal.kernel.exception.RoleAssignmentException;
 import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
-import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.model.Organization;
 import com.liferay.portal.kernel.model.ResourceConstants;
 import com.liferay.portal.kernel.model.role.RoleConstants;
@@ -174,13 +173,7 @@ public ExportImportDescriptor getExportImportDescriptor() {
 
 			@Override
 			public String getPortletId() {
-				if (FeatureFlagManagerUtil.isEnabled(
-						CompanyConstants.SYSTEM, "LPD-35914")) {
-
-					return RolesAdminPortletKeys.ROLES_ADMIN;
-				}
-
-				return null;
+				return RolesAdminPortletKeys.ROLES_ADMIN;
 			}
 
 			@Override

modules/apps/object/object-rest-impl/src/main/java/com/liferay/object/rest/internal/resource/v1_0/ObjectEntryResourceImpl.java

@@ -30,7 +30,6 @@
 import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.search.Sort;
 import com.liferay.portal.kernel.search.filter.Filter;
 import com.liferay.portal.kernel.util.GetterUtil;
@@ -372,13 +371,7 @@ public List<String> getNestedFields() {
 
 			@Override
 			public String getPortletId() {
-				if (FeatureFlagManagerUtil.isEnabled(
-						CompanyConstants.SYSTEM, "LPD-35914")) {
-
-					return _objectDefinition.getPortletId();
-				}
-
-				return null;
+				return _objectDefinition.getPortletId();
 			}
 
 			@Override