diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
index 49e9343d4a..9119c2f01c 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
@@ -157,9 +157,6 @@
-
-
@@ -176,8 +173,6 @@
-
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3Service.java b/rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3Service.java
deleted file mode 100644
index ff8dce3075..0000000000
--- a/rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3Service.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-
-package org.alfresco.integrations.connector.worm;
-
-import org.alfresco.service.cmr.repository.NodeRef;
-
-public interface ObjectLockS3Service
-{
- void setObjectLegalHold(NodeRef nodeRef, boolean enabled);
-}
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3ServiceDefaultImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3ServiceDefaultImpl.java
deleted file mode 100644
index ad7b74cd99..0000000000
--- a/rm-community/rm-community-repo/source/java/org/alfresco/integrations/connector/worm/ObjectLockS3ServiceDefaultImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-
-package org.alfresco.integrations.connector.worm;
-
-
-import org.alfresco.service.cmr.repository.NodeRef;
-
-public class ObjectLockS3ServiceDefaultImpl implements ObjectLockS3Service
-{
- @Override
- public void setObjectLegalHold(NodeRef nodeRef, boolean enabled)
- {
- // do nothing
- // s3 not installed, method not supported
- }
-}
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
index c82b09b66d..da67bea63b 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspect.java
@@ -36,7 +36,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.alfresco.integrations.connector.worm.ObjectLockS3Service;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
import org.alfresco.module.org_alfresco_module_rm.util.PropertyModificationAllowedCheck;
@@ -78,11 +77,6 @@ public class FrozenAspect extends BaseBehaviourBean
/** freeze service */
protected FreezeService freezeService;
- /**
- * Object lock S3 service
- */
- private ObjectLockS3Service objectLockS3Service;
-
/**
* Utility class for property modification
*/
@@ -96,14 +90,6 @@ public class FrozenAspect extends BaseBehaviourBean
this.freezeService = freezeService;
}
- /**
- * @param objectLockS3Service service
- */
- public void setObjectLockS3Service(ObjectLockS3Service objectLockS3Service)
- {
- this.objectLockS3Service = objectLockS3Service;
- }
-
/**
* Setter for property modification check utility
* @param propertyModificationAllowedCheck Utility class for property modification