diff --git a/common/src/main/java/com/sun/ts/lib/harness/keyword.properties b/common/src/main/java/com/sun/ts/lib/harness/keyword.properties
index dfb9e0695f..7e57ae30a4 100644
--- a/common/src/main/java/com/sun/ts/lib/harness/keyword.properties
+++ b/common/src/main/java/com/sun/ts/lib/harness/keyword.properties
@@ -425,10 +425,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/migration/threetwo/override = javaee_
 com/sun/ts/tests/ejb30/bb/session/stateless/migration/threetwo/annotated = javaee_optional ejb_2x_optional 
 com/sun/ts/tests/ejb30/bb/session/stateless/migration/threetwo/descriptor = javaee_optional ejb_2x_optional 
 com/sun/ts/tests/ejb30/bb/session/stateless/migration/threetwo/override = javaee_optional ejb_2x_optional 
-com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement = javaee_optional ejb_2x_optional 
-com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated = javaee_optional ejb_2x_optional 
-com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor = javaee_optional ejb_2x_optional 
-com/sun/ts/tests/ejb30/bb/session/stateful/remove/override = javaee_optional ejb_2x_optional 
 com/sun/ts/tests/ejb30/bb/session/stateless/migration/twothree/annotated = javaee_optional ejb_2x_optional 
 com/sun/ts/tests/ejb30/bb/session/stateless/migration/twothree/descriptor = javaee_optional ejb_2x_optional 
 com/sun/ts/tests/ejb30/bb/session/stateless/migration/twothree/override = javaee_optional ejb_2x_optional 
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/Deployment.java b/connector/src/main/java/com/sun/ts/tests/connector/deployment/Deployment.java
index 28241cf8a9..680805f011 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/deployment/Deployment.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/deployment/Deployment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,10 +20,12 @@
 
 package com.sun.ts.tests.connector.deployment;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Deployment {
+  public void initialize(Properties props);
 
-public interface Deployment extends EJBObject {
-  boolean testRarInEar() throws RemoteException;
+  public boolean testRarInEar();
+
+  public void cleanup();
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentClient.java b/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentClient.java
index 1945c8f026..99196ec22b 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentClient.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,8 +33,6 @@ public class DeploymentClient extends EETest {
   // Harness requirements
   private Deployment hr = null;
 
-  private DeploymentHome home = null;
-
   private StringBuffer logData = null;
 
   private Properties props = null;
@@ -66,9 +64,7 @@ public void setup(String[] args, Properties p) throws Exception {
 
     try {
       jc = new TSNamingContext();
-      logMsg("Looked up home!!");
-      home = (DeploymentHome) jc.lookup("java:comp/env/ejb/Deployment",
-          DeploymentHome.class);
+      hr = (Deployment) jc.lookup("java:comp/env/ejb/Deployment", Deployment.class);
       logMsg("Setup ok;");
     } catch (Exception e) {
       throw new Exception("Setup Failed!", e);
@@ -90,9 +86,9 @@ public void setup(String[] args, Properties p) throws Exception {
    */
   public void testRarInEar() throws Exception {
     try {
+      hr.initialize(props);
 
-      hr = home.create(props);
-
+      // invoke method on the EJB
       boolean result = hr.testRarInEar();
 
       if (result) {
@@ -101,15 +97,14 @@ public void testRarInEar() throws Exception {
         throw new Exception("Embedded resource adapter test failed");
       }
 
-      // invoke method on the EJB
       logMsg("Test passed;");
     } catch (Exception e) {
       throw new Exception("Test Failed!", e);
     }
   }
 
-  /* cleanup -- none in this case */
   public void cleanup() throws Exception {
+    hr.cleanup();
     logMsg("Cleanup ok;");
   }
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentEJB.java
index 799de791b8..c5d59f37f0 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,11 +28,7 @@
 import com.sun.ts.tests.common.connector.whitebox.TSDataSource;
 import com.sun.ts.tests.connector.util.DBSupport;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class DeploymentEJB implements SessionBean {
+public class DeploymentEJB {
   private TSNamingContext context = null;
 
   private Properties p = null;
@@ -56,15 +52,15 @@ public class DeploymentEJB implements SessionBean {
   public DeploymentEJB() {
   }
 
-  public void ejbCreate(Properties props) throws CreateException {
+  public void initialize(Properties props) {
     p = props;
     try {
       this.context = new TSNamingContext();
 
-      TestUtil.logTrace("ejbCreate");
+      TestUtil.logTrace("initialize");
       TestUtil.init(props);
 
-      System.out.println("Inside ejbCreate of DeploymentEJB!");
+      System.out.println("Inside initialize of DeploymentEJB!");
 
       whitebox_tx = p.getProperty("whitebox-embed");
 
@@ -129,20 +125,8 @@ public boolean testRarInEar() {
     return result;
   }
 
-  public void setSessionContext(SessionContext sc) {
-
-    try {
-      TestUtil.logTrace("setSessionContext");
-      // this.context = new TSNamingContext();
-    } catch (Exception sqle) {
-      TestUtil.printStackTrace(sqle);
-      sqle.getMessage();
-    }
-
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
+  public void cleanup() {
+    TestUtil.logTrace("cleanup");
     try {
       if (con != null) {
         con.close();
@@ -152,10 +136,4 @@ public void ejbRemove() {
     }
   }
 
-  public void ejbActivate() {
-  }
-
-  public void ejbPassivate() {
-  }
-
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentHome.java b/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentHome.java
deleted file mode 100644
index 74d5758a43..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/deployment/DeploymentHome.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.deployment;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface DeploymentHome extends EJBHome {
-  Deployment create(java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_client.xml b/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_client.xml
index 3919b6c419..e57accbfbb 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_client.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/Deployment</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.connector.deployment.DeploymentHome</home>
     <remote>com.sun.ts.tests.connector.deployment.Deployment</remote>
   </ejb-ref>
 </application-client>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.xml b/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.xml
index d7ef9bb52c..a716c24e39 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>Deployment</ejb-name>
-      <home>com.sun.ts.tests.connector.deployment.DeploymentHome</home>
-      <remote>com.sun.ts.tests.connector.deployment.Deployment</remote>
+      <business-remote>com.sun.ts.tests.connector.deployment.Deployment</business-remote>
       <ejb-class>com.sun.ts.tests.connector.deployment.DeploymentEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanA.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanA.java
index 929814d1f9..8e5dbebaec 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanA.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,11 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
 
-import java.rmi.RemoteException;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface BeanA {
+  public void initialize();
 
-public interface BeanA extends EJBObject {
   // Database methods
   /**
    * Make a JDBC <code>Connection</code> to the specified database. DataSource
@@ -34,12 +33,12 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the JDBC <code>Connection</code> could not be made.
    */
-  public void dbConnectfirst() throws RemoteException;
+  public void dbConnectfirst();
 
-  public void dbConnectsecond() throws RemoteException;
+  public void dbConnectsecond();
 
   /**
    * Creates the specified table.
@@ -47,10 +46,10 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the specified table could not be created.
    */
-  public void createData() throws RemoteException;
+  public void createData();
 
   /**
    * Add a new row to the specified table, where key is unique.
@@ -60,10 +59,10 @@ public interface BeanA extends EJBObject {
    * @param key
    *          the unique key id of the new row
    * @return boolean <code>true</code> if row was inserted; false otherwise
-   * @exception RemoteException
+   * @exception EJBException
    *              If the new row could not be added.
    */
-  public boolean insert(String str) throws RemoteException;
+  public boolean insert(String str);
 
   /**
    * Delete a range of rows from the specified table.
@@ -75,10 +74,10 @@ public interface BeanA extends EJBObject {
    * @param toKey
    *          the end of the range of row
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the range of rows could not be deleted.
    */
-  public void delete(String str) throws RemoteException;
+  public void delete(String str);
 
   /**
    * Drop the specified table.
@@ -86,10 +85,10 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table could not be dropped.
    */
-  public void destroyData() throws RemoteException;
+  public void destroyData();
 
   /**
    * Closes the JDBC <code>Connection</code> to the RDBMS.
@@ -97,10 +96,10 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the <code>Connection</code> could not be closed.
    */
-  public void dbUnConnect() throws RemoteException;
+  public void dbUnConnect();
 
   /**
    * Get the results of a row in the specified table.
@@ -111,10 +110,10 @@ public interface BeanA extends EJBObject {
    *          the unique key identifer for the row
    * @return Vector the Vector contains the row of the specified table in a
    *         prescribed format.
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table row result could not be obtained.
    */
-  public Vector getResults() throws RemoteException;
+  public Vector getResults();
 
   /**
    * Required method of the TS test infrastructure. Allows server side logging
@@ -123,7 +122,7 @@ public interface BeanA extends EJBObject {
    * @param p
    *          the TS environment specific properties
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the client/server logging relationship could not be
    *              established.
    */
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAEJB.java
index 860ac541d5..021ca2ae85 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,6 +20,8 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
 
+import jakarta.ejb.EJBException;
+
 import java.util.Properties;
 import java.util.Vector;
 
@@ -28,19 +30,12 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSDataSource;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class BeanAEJB implements SessionBean {
+public class BeanAEJB {
 
   // testProps represent the test specific properties passed in
   // from the test harness.
   private static final Properties testProps = null;
 
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   // con will be used for the table1 connection
@@ -52,19 +47,11 @@ public class BeanAEJB implements SessionBean {
   // The TxBean variables
   private static final String txBeanBRequired = "java:comp/env/ejb/TxBeanBRequired";
 
-  private BeanBHome beanBHome = null;
-
   private BeanB beanBRef = null;
 
-  // Required EJB methods
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
+  public void initialize() {
+    TestUtil.logTrace("initialize");
     try {
-      this.sctx = sc;
       this.context = new TSNamingContext();
 
       // Get the TSDataSource
@@ -72,40 +59,15 @@ public void setSessionContext(SessionContext sc) {
       TestUtil.logTrace("ds: " + ds);
       TestUtil.logTrace("TSDataSource lookup OK!");
 
-      TestUtil
-          .logMsg("Looking up the BeanB Home interface of " + txBeanBRequired);
-      beanBHome = (BeanBHome) context.lookup(txBeanBRequired, BeanBHome.class);
-
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
-      throw new EJBException(e.getMessage());
-    }
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-    try {
-      con = ds.getConnection();
+      TestUtil.logMsg("Looking up BeanB " + txBeanBRequired);
+      beanBRef = (BeanB) context.lookup(txBeanBRequired, BeanB.class);
+      beanBRef.initialize();
     } catch (Exception e) {
-      TestUtil.logErr("Exception connecting to DB", e);
+      TestUtil.logErr("Unexpected Exception setting EJB/DataSources", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbPassivate() {
-    dbUnConnect();
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // The BeanA interface implementation
 
@@ -268,8 +230,6 @@ private void dropTable1() {
   private void conUnconBeanB() {
     TestUtil.logTrace("connection to Database through BeanB");
     try {
-      beanBRef = (BeanB) beanBHome.create();
-
       TestUtil.logTrace("Logging data from server");
 
       beanBRef.dbConnect();
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAHome.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAHome.java
deleted file mode 100644
index 30583cbc83..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanAHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface BeanAHome extends EJBHome {
-  public BeanA create() throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanB.java
index bda635652a..e7c9e596c8 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,11 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
 
-import java.rmi.RemoteException;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface BeanB {
+  public void initialize();
 
-public interface BeanB extends EJBObject {
   // Database methods
   /**
    * Make a JDBC <code>Connection</code> to the specified database. DataSource
@@ -34,10 +33,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the JDBC <code>Connection</code> could not be made.
    */
-  public void dbConnect() throws RemoteException;
+  public void dbConnect();
 
   /**
    * Creates the specified table.
@@ -45,10 +44,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the specified table could not be created.
    */
-  public void createData() throws RemoteException;
+  public void createData();
 
   /**
    * Add a new row to the specified table, where key is unique.
@@ -58,10 +57,10 @@ public interface BeanB extends EJBObject {
    * @param key
    *          the unique key id of the new row
    * @return boolean <code>true</code> if row was inserted; false otherwise
-   * @exception RemoteException
+   * @exception EJBException
    *              If the new row could not be added.
    */
-  public boolean insert(String str) throws RemoteException;
+  public boolean insert(String str);
 
   /**
    * Delete a range of rows from the specified table.
@@ -73,10 +72,10 @@ public interface BeanB extends EJBObject {
    * @param toKey
    *          the end of the range of row
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the range of rows could not be deleted.
    */
-  public void delete(String str) throws RemoteException;
+  public void delete(String str);
 
   /**
    * Drop the specified table.
@@ -84,10 +83,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table could not be dropped.
    */
-  public void destroyData() throws RemoteException;
+  public void destroyData();
 
   /**
    * Closes the JDBC <code>Connection</code> to the RDBMS.
@@ -95,10 +94,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the <code>Connection</code> could not be closed.
    */
-  public void dbUnConnect() throws RemoteException;
+  public void dbUnConnect();
 
   /**
    * Get the results of a row in the specified table.
@@ -109,10 +108,10 @@ public interface BeanB extends EJBObject {
    *          the unique key identifer for the row
    * @return Vector the Vector contains the row of the specified table in a
    *         prescribed format.
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table row result could not be obtained.
    */
-  public Vector getResults() throws RemoteException;
+  public Vector getResults();
 
   /**
    * Required method of the TS test infrastructure. Allows server side logging
@@ -121,7 +120,7 @@ public interface BeanB extends EJBObject {
    * @param p
    *          the TS environment specific properties
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the client/server logging relationship could not be
    *              established.
    */
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBEJB.java
index 10096f9358..25e06c4cb6 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,6 +20,8 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
 
+import jakarta.ejb.EJBException;
+
 import java.util.Properties;
 import java.util.Vector;
 
@@ -28,19 +30,12 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSDataSource;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class BeanBEJB implements SessionBean {
+public class BeanBEJB {
 
   // testProps represent the test specific properties passed in
   // from the test harness.
   private static final Properties testProps = null;
 
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   // con will be used for the table1 connection
@@ -49,15 +44,9 @@ public class BeanBEJB implements SessionBean {
   // TSDataSources
   private TSDataSource ds;
 
-  // Required EJB methods
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
+   public void initialize() {
+    TestUtil.logTrace("initialize");
     try {
-      this.sctx = sc;
       this.context = new TSNamingContext();
 
       // Get the TSDataSource
@@ -66,36 +55,11 @@ public void setSessionContext(SessionContext sc) {
       TestUtil.logTrace("TSDataSource lookup OK!");
 
     } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("Unexpected Exception setting DataSource", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-    try {
-      con = ds.getConnection();
-    } catch (Exception e) {
-      TestUtil.logErr("Exception connecting to DB", e);
-      throw new EJBException(e.getMessage());
-    }
-
-  }
-
-  public void ejbPassivate() {
-    dbUnConnect();
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // The BeanB interface implementation
 
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBHome.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBHome.java
deleted file mode 100644
index 3833a7a23a..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/BeanBHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface BeanBHome extends EJBHome {
-  public BeanB create() throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/Client.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/Client.java
index 7a52072da5..78ffbb1d8d 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/Client.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,8 +37,6 @@ public class Client extends EETest {
 
   private static final String testDir = System.getProperty("user.dir");
 
-  private TestBeanHome beanHome = null;
-
   private TestBean beanRef = null;
 
   private Properties testProps = new Properties();
@@ -66,8 +64,9 @@ public void setup(String[] args, Properties p) throws Exception {
       logMsg("Get the naming context");
       jctx = new TSNamingContext();
 
-      logMsg("Getting the EJB Home interface for " + testLookup);
-      beanHome = (TestBeanHome) jctx.lookup(testLookup, TestBeanHome.class);
+      logMsg("Getting the EJB " + testLookup);
+      beanRef = (TestBean) jctx.lookup(testLookup, TestBean.class);
+      beanRef.initialize();
 
       logMsg("Setup ok");
     } catch (Exception e) {
@@ -93,9 +92,6 @@ public void setup(String[] args, Properties p) throws Exception {
    */
   public void testMultiComponentLocalTx() throws Exception {
     try {
-      logMsg("Creating EJB TestBean instance");
-      beanRef = (TestBean) beanHome.create();
-
       logMsg("Logging data from server");
 
       boolean testResult = false;
@@ -109,12 +105,6 @@ public void testMultiComponentLocalTx() throws Exception {
         logMsg("test1 passed");
     } catch (Exception e) {
       throw new Exception("test1 failed", e);
-    } finally {
-      try {
-        beanRef.remove();
-      } catch (Exception e) {
-        TestUtil.printStackTrace(e);
-      }
     }
   }
 
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBean.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBean.java
index 688fbf85ef..bb49c1d3b0 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBean.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,10 +20,8 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
 
-import java.rmi.RemoteException;
+public interface TestBean {
+  public void initialize();
 
-import jakarta.ejb.EJBObject;
-
-public interface TestBean extends EJBObject {
-  public boolean test1() throws RemoteException;
+  public boolean test1();
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanEJB.java
index 72550d8cb0..552aca1d9b 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,11 +25,7 @@
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class TestBeanEJB implements SessionBean {
+public class TestBeanEJB {
 
   // testProps represent the test specific properties passed in
   // from the test harness.
@@ -38,53 +34,26 @@ public class TestBeanEJB implements SessionBean {
   // The TSNamingContext abstracts away the underlying distribution protocol.
   private TSNamingContext jctx = null;
 
-  private SessionContext sctx = null;
-
   // BeanA variables
   private static final String txBeanARequired = "java:comp/env/ejb/TxBeanARequired";
 
-  private BeanAHome beanAHome = null;
-
   private BeanA beanARef = null;
 
-  // The requiredEJB methods
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
+  public void initialize() {
+    TestUtil.logTrace("initialize");
     try {
       TestUtil.logMsg("Getting Naming Context");
       jctx = new TSNamingContext();
 
-      TestUtil
-          .logMsg("Looking up the BeanA Home interface of " + txBeanARequired);
-      beanAHome = (BeanAHome) jctx.lookup(txBeanARequired, BeanAHome.class);
-
+      TestUtil.logMsg("Looking up BeanA " + txBeanARequired);
+      beanARef = (BeanA) jctx.lookup(txBeanARequired, BeanA.class);
+      beanARef.initialize();
     } catch (Exception e) {
       TestUtil.logErr("Create exception: " + e.getMessage());
       TestUtil.printStackTrace(e);
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // TestBean interface (our business methods)
 
@@ -94,9 +63,6 @@ public boolean test1() {
     boolean testResult = false;
 
     try {
-      TestUtil.logTrace("Creating EJB instance of " + txBeanARequired);
-      beanARef = (BeanA) beanAHome.create();
-
       TestUtil.logTrace("Logging data from server");
 
       TestUtil.logTrace("Calling Bean A");
@@ -116,7 +82,6 @@ public boolean test1() {
         beanARef.dbConnectsecond();
         beanARef.destroyData();
         beanARef.dbUnConnect();
-        beanARef.remove();
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
       }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanHome.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanHome.java
deleted file mode 100644
index 9a7a98cb2c..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/TestBeanHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TestBeanHome extends EJBHome {
-  public TestBean create() throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.xml b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.xml
index e5898a24a8..510b3db1c2 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/TestBean</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBeanHome</home>
     <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBean</remote>
   </ejb-ref>
 </application-client>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.xml b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.xml
index 1f99b9d7cf..37d17ede53 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_cts_tests_connector_localTx_transaction_conSharing2_TestBean</ejb-name>
-      <home>com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBeanHome</home>
-      <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBean</remote>
+      <business-remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBean</business-remote>
       <ejb-class>com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Bean</transaction-type>
@@ -50,7 +49,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/TxBeanARequired</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanAHome</home>
         <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanA</remote>
       </ejb-ref>
       <security-identity>
@@ -59,8 +57,7 @@
     </session>
     <session>
       <ejb-name>connector_localTx_transaction_conSharing2_TxBeanARequired</ejb-name>
-      <home>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanAHome</home>
-      <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanA</remote>
+      <business-remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanA</business-remote>
       <ejb-class>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanAEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -72,7 +69,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/TxBeanBRequired</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanBHome</home>
         <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanB</remote>
       </ejb-ref>
       <resource-ref>
@@ -88,8 +84,7 @@
     </session>
     <session>
       <ejb-name>connector_localTx_transaction_conSharing2_TxBeanBRequired</ejb-name>
-      <home>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanBHome</home>
-      <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanB</remote>
+      <business-remote>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanB</business-remote>
       <ejb-class>com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanBEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanA.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanA.java
index bca92737f5..76cbb7cb89 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanA.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,11 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
 
-import java.rmi.RemoteException;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface BeanA {
+  public void initialize();
 
-public interface BeanA extends EJBObject {
   // Database methods
   /**
    * Make a JDBC <code>Connection</code> to the specified database. DataSource
@@ -34,12 +33,12 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the JDBC <code>Connection</code> could not be made.
    */
-  public void dbConnectfirst() throws RemoteException;
+  public void dbConnectfirst();
 
-  public void dbConnectsecond() throws RemoteException;
+  public void dbConnectsecond();
 
   /**
    * Creates the specified table.
@@ -47,10 +46,10 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the specified table could not be created.
    */
-  public void createData() throws RemoteException;
+  public void createData();
 
   /**
    * Add a new row to the specified table, where key is unique.
@@ -60,10 +59,10 @@ public interface BeanA extends EJBObject {
    * @param key
    *          the unique key id of the new row
    * @return boolean <code>true</code> if row was inserted; false otherwise
-   * @exception RemoteException
+   * @exception EJBException
    *              If the new row could not be added.
    */
-  public boolean insert(String str) throws RemoteException;
+  public boolean insert(String str);
 
   /**
    * Delete a range of rows from the specified table.
@@ -75,10 +74,10 @@ public interface BeanA extends EJBObject {
    * @param toKey
    *          the end of the range of row
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the range of rows could not be deleted.
    */
-  public void delete(String str) throws RemoteException;
+  public void delete(String str);
 
   /**
    * Drop the specified table.
@@ -86,10 +85,10 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table could not be dropped.
    */
-  public void destroyData() throws RemoteException;
+  public void destroyData();
 
   /**
    * Closes the JDBC <code>Connection</code> to the RDBMS.
@@ -97,10 +96,10 @@ public interface BeanA extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the <code>Connection</code> could not be closed.
    */
-  public void dbUnConnect() throws RemoteException;
+  public void dbUnConnect();
 
   /**
    * Get the results of a row in the specified table.
@@ -111,10 +110,10 @@ public interface BeanA extends EJBObject {
    *          the unique key identifer for the row
    * @return Vector the Vector contains the row of the specified table in a
    *         prescribed format.
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table row result could not be obtained.
    */
-  public Vector getResults() throws RemoteException;
+  public Vector getResults();
 
   /**
    * Required method of the TS test infrastructure. Allows server side logging
@@ -123,7 +122,7 @@ public interface BeanA extends EJBObject {
    * @param p
    *          the TS environment specific properties
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the client/server logging relationship could not be
    *              established.
    */
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAEJB.java
index f80c7596ef..2a2a2b0da0 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,19 +28,14 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class BeanAEJB implements SessionBean {
+public class BeanAEJB {
 
   // testProps represent the test specific properties passed in
   // from the test harness.
   private static final Properties testProps = null;
 
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   // con will be used for the table1 connection
@@ -52,19 +47,11 @@ public class BeanAEJB implements SessionBean {
   // The TxBean variables
   private static final String txBeanBRequired = "java:comp/env/ejb/TxBeanBRequired";
 
-  private BeanBHome beanBHome = null;
-
   private BeanB beanBRef = null;
 
-  // Required EJB methods
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
+  public void initialize() {
+    TestUtil.logTrace("initialize");
     try {
-      this.sctx = sc;
       this.context = new TSNamingContext();
 
       // Get the TSDataSource
@@ -72,41 +59,15 @@ public void setSessionContext(SessionContext sc) {
       TestUtil.logTrace("ds: " + ds);
       TestUtil.logTrace("TSDataSource lookup OK!");
 
-      TestUtil
-          .logMsg("Looking up the BeanB Home interface of " + txBeanBRequired);
-      beanBHome = (BeanBHome) context.lookup(txBeanBRequired, BeanBHome.class);
-
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
-      throw new EJBException(e.getMessage());
-    }
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-
-    TestUtil.logTrace("ejbActivate");
-    try {
-      con = ds.getConnection();
+      TestUtil.logMsg("Looking up BeanB " + txBeanBRequired);
+      beanBRef = (BeanB) context.lookup(txBeanBRequired, BeanB.class);
+      beanBRef.initialize();
     } catch (Exception e) {
-      TestUtil.logErr("Exception connecting to DB", e);
+      TestUtil.logErr("Unexpected Exception setting EJB/DataSource", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbPassivate() {
-    dbUnConnect();
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // The BeanA interface implementation
 
@@ -269,14 +230,11 @@ private void dropTable1() {
   private void conUnconBeanB() {
     TestUtil.logTrace("connection to Database through BeanB");
     try {
-      beanBRef = (BeanB) beanBHome.create();
-
       TestUtil.logTrace("Logging data from server");
 
       beanBRef.dbConnect();
       beanBRef.createData();
       beanBRef.dbUnConnect();
-
     } catch (Exception e) {
       TestUtil.logErr("Caught exception: " + e.getMessage());
       TestUtil.printStackTrace(e);
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAHome.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAHome.java
deleted file mode 100644
index 1a36a34ed8..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanAHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface BeanAHome extends EJBHome {
-  public BeanA create() throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanB.java
index 355c390b57..e609c6de89 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,11 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
 
-import java.rmi.RemoteException;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface BeanB {
+  public void initialize();
 
-public interface BeanB extends EJBObject {
   // Database methods
   /**
    * Make a JDBC <code>Connection</code> to the specified database. DataSource
@@ -34,10 +33,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the JDBC <code>Connection</code> could not be made.
    */
-  public void dbConnect() throws RemoteException;
+  public void dbConnect();
 
   /**
    * Creates the specified table.
@@ -45,10 +44,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the specified table could not be created.
    */
-  public void createData() throws RemoteException;
+  public void createData();
 
   /**
    * Add a new row to the specified table, where key is unique.
@@ -58,10 +57,10 @@ public interface BeanB extends EJBObject {
    * @param key
    *          the unique key id of the new row
    * @return boolean <code>true</code> if row was inserted; false otherwise
-   * @exception RemoteException
+   * @exception EJBException
    *              If the new row could not be added.
    */
-  public boolean insert(String str) throws RemoteException;
+  public boolean insert(String str);
 
   /**
    * Delete a range of rows from the specified table.
@@ -73,10 +72,10 @@ public interface BeanB extends EJBObject {
    * @param toKey
    *          the end of the range of row
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the range of rows could not be deleted.
    */
-  public void delete(String str) throws RemoteException;
+  public void delete(String str);
 
   /**
    * Drop the specified table.
@@ -84,10 +83,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table could not be dropped.
    */
-  public void destroyData() throws RemoteException;
+  public void destroyData();
 
   /**
    * Closes the JDBC <code>Connection</code> to the RDBMS.
@@ -95,10 +94,10 @@ public interface BeanB extends EJBObject {
    * @param tName
    *          the name of the table
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the <code>Connection</code> could not be closed.
    */
-  public void dbUnConnect() throws RemoteException;
+  public void dbUnConnect();
 
   /**
    * Get the results of a row in the specified table.
@@ -109,10 +108,10 @@ public interface BeanB extends EJBObject {
    *          the unique key identifer for the row
    * @return Vector the Vector contains the row of the specified table in a
    *         prescribed format.
-   * @exception RemoteException
+   * @exception EJBException
    *              If the table row result could not be obtained.
    */
-  public Vector getResults() throws RemoteException;
+  public Vector getResults();
 
   /**
    * Required method of the TS test infrastructure. Allows server side logging
@@ -121,7 +120,7 @@ public interface BeanB extends EJBObject {
    * @param p
    *          the TS environment specific properties
    * @return void
-   * @exception RemoteException
+   * @exception EJBException
    *              If the client/server logging relationship could not be
    *              established.
    */
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBEJB.java
index d484abd72e..781f9ac8f6 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,19 +28,14 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class BeanBEJB implements SessionBean {
+public class BeanBEJB {
 
   // testProps represent the test specific properties passed in
   // from the test harness.
   private static final Properties testProps = null;
 
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   // con will be used for the table1 connection
@@ -49,52 +44,21 @@ public class BeanBEJB implements SessionBean {
   // TSDataSources
   private TSDataSource ds;
 
-  // Required EJB methods
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
+  public void initialize() {
+    TestUtil.logTrace("initialize");
     try {
-      this.sctx = sc;
       this.context = new TSNamingContext();
 
       // Get the TSDataSource
       ds = (TSDataSource) context.lookup("java:comp/env/eis/whitebox-tx");
       TestUtil.logTrace("ds: " + ds);
       TestUtil.logTrace("TSDataSource lookup OK!");
-
     } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("Unexpected Exception setting DataSource", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-    try {
-      con = ds.getConnection();
-    } catch (Exception e) {
-      TestUtil.logErr("Exception connecting to DB", e);
-      throw new EJBException(e.getMessage());
-    }
-  }
-
-  public void ejbPassivate() {
-    dbUnConnect();
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // The BeanB interface implementation
 
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBHome.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBHome.java
deleted file mode 100644
index 3b666c5df4..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/BeanBHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface BeanBHome extends EJBHome {
-  public BeanB create() throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/Client.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/Client.java
index e35445c472..aea7a060ff 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/Client.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,8 +37,6 @@ public class Client extends EETest {
 
   private static final String testDir = System.getProperty("user.dir");
 
-  private TestBeanHome beanHome = null;
-
   private TestBean beanRef = null;
 
   private Properties testProps = new Properties();
@@ -66,8 +64,9 @@ public void setup(String[] args, Properties p) throws Exception {
       logMsg("Get the naming context");
       jctx = new TSNamingContext();
 
-      logMsg("Getting the EJB Home interface for " + testLookup);
-      beanHome = (TestBeanHome) jctx.lookup(testLookup, TestBeanHome.class);
+      logMsg("Getting the EJB interface for " + testLookup);
+      beanRef = (TestBean) jctx.lookup(testLookup, TestBean.class);
+      beanRef.initialize();
 
       logMsg("Setup ok");
     } catch (Exception e) {
@@ -92,9 +91,6 @@ public void setup(String[] args, Properties p) throws Exception {
    */
   public void test1() throws Exception {
     try {
-      logMsg("Creating EJB TestBean instance");
-      beanRef = (TestBean) beanHome.create();
-
       logMsg("Logging data from server");
 
       boolean testResult = false;
@@ -108,12 +104,6 @@ public void test1() throws Exception {
         logMsg("test1 passed");
     } catch (Exception e) {
       throw new Exception("test1 failed", e);
-    } finally {
-      try {
-        beanRef.remove();
-      } catch (Exception e) {
-        TestUtil.printStackTrace(e);
-      }
     }
   }
 
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBean.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBean.java
index 757b538e0c..2ab19d68ed 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBean.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,10 +20,8 @@
 
 package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
 
-import java.rmi.RemoteException;
+public interface TestBean {
+  public void initialize();
 
-import jakarta.ejb.EJBObject;
-
-public interface TestBean extends EJBObject {
-  public boolean test1() throws RemoteException;
+  public boolean test1();
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanEJB.java
index 86f76bd332..1b1bb3b7f6 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,11 +25,7 @@
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class TestBeanEJB implements SessionBean {
+public class TestBeanEJB {
 
   // testProps represent the test specific properties passed in
   // from the test harness.
@@ -38,53 +34,26 @@ public class TestBeanEJB implements SessionBean {
   // The TSNamingContext abstracts away the underlying distribution protocol.
   private TSNamingContext jctx = null;
 
-  private SessionContext sctx = null;
-
   // BeanA variables
   private static final String txBeanARequired = "java:comp/env/ejb/TxBeanARequired";
 
-  private BeanAHome beanAHome = null;
-
   private BeanA beanARef = null;
 
-  // The requiredEJB methods
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
+  public void initialize() {
+    TestUtil.logTrace("initialize");
     try {
       TestUtil.logMsg("Getting Naming Context");
       jctx = new TSNamingContext();
 
-      TestUtil
-          .logMsg("Looking up the BeanA Home interface of " + txBeanARequired);
-      beanAHome = (BeanAHome) jctx.lookup(txBeanARequired, BeanAHome.class);
-
+      TestUtil.logMsg("Looking up BeanA " + txBeanARequired);
+      beanARef = (BeanA) jctx.lookup(txBeanARequired, BeanA.class);
+      beanARef.initialize();
     } catch (Exception e) {
       TestUtil.logErr("Create exception: " + e.getMessage());
       TestUtil.printStackTrace(e);
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // TestBean interface (our business methods)
 
@@ -94,9 +63,6 @@ public boolean test1() {
     boolean testResult = false;
 
     try {
-      TestUtil.logTrace("Creating EJB instance of " + txBeanARequired);
-      beanARef = (BeanA) beanAHome.create();
-
       TestUtil.logTrace("Logging data from server");
 
       TestUtil.logTrace("Calling Bean A");
@@ -106,7 +72,6 @@ public boolean test1() {
       TestUtil.logTrace("Bean A call completed.");
 
       testResult = true;
-
     } catch (Exception e) {
       TestUtil.logErr("Caught exception: " + e.getMessage());
       TestUtil.printStackTrace(e);
@@ -116,7 +81,6 @@ public boolean test1() {
         beanARef.dbConnectsecond();
         beanARef.destroyData();
         beanARef.dbUnConnect();
-        beanARef.remove();
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
       }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanHome.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanHome.java
deleted file mode 100644
index ef8887ee42..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/TestBeanHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TestBeanHome extends EJBHome {
-  public TestBean create() throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.xml b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.xml
index 6952661460..9b377c0b46 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/TestBean</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBeanHome</home>
     <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBean</remote>
   </ejb-ref>
 </application-client>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.xml b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.xml
index 912ad4fa5f..2db5ef8228 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_cts_tests_connector_localTx_transaction_conSharing3_TestBean</ejb-name>
-      <home>com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBeanHome</home>
-      <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBean</remote>
+      <business-remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBean</business-remote>
       <ejb-class>com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -50,7 +49,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/TxBeanARequired</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanAHome</home>
         <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanA</remote>
       </ejb-ref>
       <security-identity>
@@ -59,8 +57,7 @@
     </session>
     <session>
       <ejb-name>connector_localTx_transaction_conSharing3_TxBeanARequired</ejb-name>
-      <home>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanAHome</home>
-      <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanA</remote>
+      <business-remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanA</business-remote>
       <ejb-class>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanAEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -72,7 +69,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/TxBeanBRequired</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanBHome</home>
         <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanB</remote>
       </ejb-ref>
       <resource-ref>
@@ -88,8 +84,7 @@
     </session>
     <session>
       <ejb-name>connector_localTx_transaction_conSharing3_TxBeanBRequired</ejb-name>
-      <home>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanBHome</home>
-      <remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanB</remote>
+      <business-remote>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanB</business-remote>
       <ejb-class>com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanBEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATest.java
index 1c57b40ca2..c454c38b37 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATest.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,12 @@
 
 package com.sun.ts.tests.connector.xa.transaction.jta;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface JTATest {
+  void initialize(Properties props);
 
-public interface JTATest extends EJBObject {
-  boolean testXAResource1() throws RemoteException;
+  boolean testXAResource1();
 
-  boolean testXAResource2() throws RemoteException;
+  boolean testXAResource2();
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestClient.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestClient.java
index 6e85e456c2..8ffb89ca3e 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestClient.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -34,8 +34,6 @@ public class JTATestClient extends EETest {
   // Harness requirements
   private JTATest hr = null;
 
-  private JTATestHome home = null;
-
   private StringBuffer logData = null;
 
   private Properties props = null;
@@ -67,9 +65,7 @@ public void setup(String[] args, Properties p) throws Exception {
 
     try {
       jc = new TSNamingContext();
-      logMsg("Looked up home!!");
-      home = (JTATestHome) jc.lookup("java:comp/env/ejb/JTATest",
-          JTATestHome.class);
+      hr = (JTATest) jc.lookup("java:comp/env/ejb/JTATest", JTATest.class);
       logMsg("Setup ok;");
     } catch (Exception e) {
       throw new Exception("Setup Failed!", e);
@@ -97,7 +93,7 @@ public void setup(String[] args, Properties p) throws Exception {
   public void testXAResource1() throws Exception {
     try {
 
-      hr = home.create(props);
+      hr.initialize(props);
 
       boolean result = hr.testXAResource1();
 
@@ -130,7 +126,7 @@ public void testXAResource1() throws Exception {
   public void testXAResource2() throws Exception {
     try {
 
-      hr = home.create(props);
+      hr.initialize(props);
 
       boolean result = hr.testXAResource2();
 
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestEJB.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestEJB.java
index 7a3880c069..e7b46c3737 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestEJB.java
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,11 +29,7 @@
 import com.sun.ts.tests.common.connector.whitebox.TSDataSource;
 import com.sun.ts.tests.connector.util.DBSupport;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class JTATestEJB implements SessionBean {
+public class JTATestEJB {
   private TSNamingContext context;
 
   private String str;
@@ -57,11 +53,12 @@ public class JTATestEJB implements SessionBean {
   public JTATestEJB() {
   }
 
-  public void ejbCreate(Properties props) throws CreateException {
+  public void initialize(Properties props) {
     p = props;
+
     try {
-      TestUtil.logTrace("ejbCreate");
-      System.out.println("ejbCreate done");
+      TestUtil.logTrace("initialize");
+      context = new TSNamingContext();
       TestUtil.init(props);
       whitebox_xa = p.getProperty("whitebox-xa");
       System.out.println("got props");
@@ -87,12 +84,8 @@ public boolean testXAResource1() {
     boolean results = true;
 
     try {
-      // create EJB
-      JTATest hr = null;
       try {
         ds1.clearLog();
-        TSNamingContext ic = new TSNamingContext();
-        TestUtil.logMsg("Got the EJB!!");
         TestUtil.logMsg("Got RA log.");
         ds1.setLogFlag(true);
         con = ds1.getConnection();
@@ -227,33 +220,4 @@ public boolean testXAResource2() {
     return results;
   }
 
-  public void setSessionContext(SessionContext sc) {
-
-    try {
-      TestUtil.logTrace("setSessionContext");
-      this.context = new TSNamingContext();
-    } catch (Exception sqle) {
-      TestUtil.printStackTrace(sqle);
-      sqle.getMessage();
-    }
-
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-    try {
-      if (con != null) {
-        con.close();
-      }
-    } catch (Exception ex) {
-      ex.printStackTrace();
-    }
-  }
-
-  public void ejbActivate() {
-  }
-
-  public void ejbPassivate() {
-  }
-
 }
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestHome.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestHome.java
deleted file mode 100644
index 4f90bc6dd6..0000000000
--- a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/JTATestHome.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.connector.xa.transaction.jta;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface JTATestHome extends EJBHome {
-  JTATest create(java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.xml b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.xml
index bcca3346d4..667940a9dc 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,6 @@
     <ejb-ref>
         <ejb-ref-name>ejb/JTATest</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.connector.xa.transaction.jta.JTATestHome</home>
         <remote>com.sun.ts.tests.connector.xa.transaction.jta.JTATest</remote>
     </ejb-ref>
 </application-client>
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.xml b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.xml
index adc6b37f58..0aef5ec742 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.xml
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.xml
@@ -23,15 +23,13 @@
     <session>
       <display-name>JTATest</display-name>
       <ejb-name>JTATest</ejb-name>
-      <home>com.sun.ts.tests.connector.xa.transaction.jta.JTATestHome</home>
-      <remote>com.sun.ts.tests.connector.xa.transaction.jta.JTATest</remote>
+      <business-remote>com.sun.ts.tests.connector.xa.transaction.jta.JTATest</business-remote>
       <ejb-class>com.sun.ts.tests.connector.xa.transaction.jta.JTATestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/JTATest</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.connector.xa.transaction.jta.JTATestHome</home>
         <remote>com.sun.ts.tests.connector.xa.transaction.jta.JTATest</remote>
         <ejb-link>JTATest</ejb-link>
       </ejb-ref>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/Client.java
index 52f1012071..522698ac07 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,7 +26,6 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome;
 
 import jakarta.ejb.EJB;
 
@@ -43,9 +42,6 @@ public class Client extends ClientBase {
   @EJB(name = "removeNotRetainBean")
   private static RemoveNotRetainIF removeNotRetainBean;
 
-  @EJB(name = "twoRemoteHome")
-  private static TwoRemoteHome twoRemoteHome;
-
   public static void main(String[] args) {
     Client theTests = new Client();
     Status s = theTests.run(args, System.out, System.err);
@@ -68,10 +64,6 @@ protected RemoveNotRetainIF getRemoveNotRetainBean() {
     return removeNotRetainBean;
   }
 
-  protected TwoRemoteHome getTwoRemoteHome() {
-    return twoRemoteHome;
-  }
-
   /*
    * @testName: removeBean
    * 
@@ -209,31 +201,6 @@ protected TwoRemoteHome getTwoRemoteHome() {
    * even though the remove method is retainIfException true.
    *
    */
-  /*
-   * @testName: removeTwoRemoteHome
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: removeTwoRemoteHomeHandle
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: testBeanRemoveTwoLocal
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-
   /*
    * @testName: testBeanretainBeanOverloaded
    * 
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveBean.java
index 6b351a70af..9d74910dbb 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,17 +26,12 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocalIF;
 import com.sun.ts.tests.ejb30.common.appexception.AtUncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome;
 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.Local;
-import jakarta.ejb.LocalHome;
 import jakarta.ejb.Remote;
-import jakarta.ejb.RemoteHome;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateful;
@@ -44,8 +39,6 @@
 @Stateful(name = "RemoveBean")
 @Remote({ RemoveIF.class, Remove2IF.class })
 @Local({ RemoveLocalIF.class, RemoveLocal2IF.class })
-@RemoteHome(TwoRemoteHome.class)
-@LocalHome(TwoLocalHome.class)
 public class RemoveBean
     implements RemoveIF, Remove2IF, RemoveLocal2IF, RemoveLocalIF {
   @Resource(name = "sessionContext")
@@ -54,10 +47,6 @@ public class RemoveBean
   public RemoveBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveNotRetainBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveNotRetainBean.java
index 944eb5f78e..12606fb5a7 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveNotRetainBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/RemoveNotRetainBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,7 +26,6 @@
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
 import jakarta.annotation.Resource;
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Remove;
@@ -35,9 +34,6 @@
 
 @Stateful(name = "RemoveNotRetainBean")
 @Remote({ RemoveNotRetainIF.class })
-// @Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-// @RemoteHome(TwoRemoteHome.class)
-// @LocalHome(TwoLocalHome.class)
 public class RemoveNotRetainBean implements RemoveNotRetainIF {
   @Resource(name = "sessionContext")
   private SessionContext sessionContext;
@@ -45,9 +41,6 @@ public class RemoveNotRetainBean implements RemoveNotRetainIF {
   public RemoveNotRetainBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/StatelessTestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/StatelessTestBean.java
index 45e62c6d0f..7f446ac4b4 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/StatelessTestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/StatelessTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,7 +26,6 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocalIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestBeanBase;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome;
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJB;
@@ -52,9 +51,6 @@ public class StatelessTestBean extends TestBeanBase implements TestIF {
   @EJB(name = "removeBean2Remote")
   private Remove2IF removeBean2Remote;
 
-  @EJB(name = "twoLocalHome")
-  private TwoLocalHome twoLocalHome;
-
   public void remove() {
   }
 
@@ -68,10 +64,6 @@ protected RemoveLocal2IF getRemoveLocalBean2() {
     return (RemoveLocal2IF) (sessionContext.lookup("removeBean2"));
   }
 
-  protected TwoLocalHome getTwoLocalHome() {
-    return (TwoLocalHome) (sessionContext.lookup("twoLocalHome"));
-  }
-
   protected void setRemoveLocalBean(RemoveLocalIF b) {
     this.removeBean = b;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/build.xml
index cfdc74cb69..2688473bc8 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/annotated/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,10 +37,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocal2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocalIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
@@ -58,8 +54,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/Remove2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveNotRetainIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/ClientBase.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/ClientBase.java
index 13c678171e..783d53631d 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/ClientBase.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/ClientBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,11 +29,7 @@
 import com.sun.ts.tests.ejb30.common.appexception.UncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteIF;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.Handle;
 import jakarta.ejb.NoSuchEJBException;
 import jakarta.ejb.RemoveException;
 
@@ -56,8 +52,6 @@ abstract public class ClientBase extends EETest {
 
   abstract protected TestIF getTestBean();
 
-  abstract protected TwoRemoteHome getTwoRemoteHome();
-
   public void setup(String[] args, Properties p) throws Exception {
     props = p;
     removeBean = getRemoveBean();
@@ -437,93 +431,4 @@ public void alwaysRemoveAfterSystemException() throws Exception {
     }
   }
 
-  /*
-   * testName: removeTwoRemoteHome
-   * 
-   * @test_Strategy:
-   *
-   */
-  public void removeTwoRemoteHome() throws Exception {
-    TwoRemoteHome beanHome = getTwoRemoteHome();
-    TwoRemoteIF bean = null;
-    try {
-      bean = beanHome.create();
-      bean.remove();
-    } catch (RemoveException e) {
-      throw new Exception(e);
-    } catch (CreateException e) {
-      throw new Exception(e);
-    } catch (RemoteException e) {
-      throw new Exception(e);
-    }
-    try {
-      bean.remove();
-      throw new Exception(
-          "Expecting java.rmi.NoSuchObjectException, but got none.");
-    } catch (NoSuchObjectException e) {
-      TLogger.log("Got expected exception: " + e.toString());
-    } catch (RemoveException e) {
-      throw new Exception(e);
-    } catch (RemoteException e) {
-      throw new Exception(e);
-    }
-  }
-
-  /*
-   * testName: removeTwoRemoteHomeHandle
-   * 
-   * @test_Strategy:
-   *
-   */
-  public void removeTwoRemoteHomeHandle() throws Exception {
-    TwoRemoteHome beanHome = getTwoRemoteHome();
-    TwoRemoteIF bean = null;
-    try {
-      bean = beanHome.create();
-      beanHome.remove(bean);
-    } catch (RemoveException e) {
-      TLogger.log("Got expected exception " + e.toString());
-    } catch (CreateException e) {
-      throw new Exception(e);
-    } catch (RemoteException e) {
-      throw new Exception(e);
-    }
-
-    try {
-      Handle handle = bean.getHandle();
-      beanHome.remove(handle);
-      TLogger.log("Successfully removed bean handler " + handle);
-    } catch (RemoveException e) {
-      throw new Exception(e);
-    } catch (RemoteException e) {
-      throw new Exception(e);
-    }
-
-    try {
-      bean.remove();
-      throw new Exception(
-          "Expecting java.rmi.NoSuchObjectException, but got none.");
-    } catch (NoSuchObjectException e) {
-      TLogger.log("Got expected exception: " + e.toString());
-    } catch (RemoveException e) {
-      throw new Exception(e);
-    } catch (RemoteException e) {
-      throw new Exception(e);
-    }
-  }
-
-  /*
-   * testName: testBeanRemoveTwoLocal
-   * 
-   * @test_Strategy:
-   *
-   */
-  public void testBeanRemoveTwoLocal() throws Exception {
-    try {
-      testBean.removeTwoLocal();
-    } catch (TestFailedException e) {
-      throw new Exception(e);
-    }
-  }
-
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.java
index 368dc23f17..78424e10be 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,12 +25,8 @@
 import com.sun.ts.tests.ejb30.common.appexception.AtUncheckedAppException;
 import com.sun.ts.tests.ejb30.common.appexception.UncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalIF;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.NoSuchEJBException;
-import jakarta.ejb.NoSuchObjectLocalException;
 import jakarta.ejb.RemoveException;
 
 abstract public class TestBeanBase implements TestIF {
@@ -43,8 +39,6 @@ abstract public class TestBeanBase implements TestIF {
 
   abstract protected Remove2IF getRemoveRemoteBean2();
 
-  abstract protected TwoLocalHome getTwoLocalHome();
-
   abstract protected void setRemoveLocalBean(RemoveLocalIF b);
 
   abstract protected void setRemoveLocalBean2(RemoveLocal2IF b);
@@ -244,36 +238,4 @@ public void retainBean2Remote() throws TestFailedException {
     }
   }
 
-  //////////////////////////////////////////////////////////////////////
-
-  public void removeTwoLocal() throws TestFailedException {
-    TwoLocalHome beanHome = getTwoLocalHome();
-    TwoLocalIF bean = null;
-    try {
-      bean = beanHome.create();
-      beanHome.remove(bean);
-      throw new TestFailedException(
-          "Expecting jakarta.ejb.RemoveException, but got none");
-    } catch (RemoveException e) {
-      // TLogger.log("Got expected exception " + e.toString());
-    } catch (CreateException e) {
-      throw new TestFailedException(
-          "Expecting jakarta.ejb.RemoveException, but got", e);
-    }
-    try {
-      bean.remove();
-    } catch (RemoveException e) {
-      throw new TestFailedException("Expecting no exception, but got", e);
-    }
-    try {
-      bean.remove();
-      throw new TestFailedException(
-          "Expecting jakarta.ejb.NoSuchObjectLocalException, " + "but got none.");
-    } catch (NoSuchObjectLocalException e) {
-      // TLogger.log("Got expected exception: " + e.toString());
-    } catch (RemoveException e) {
-      throw new TestFailedException(
-          "Expecting jakarta.ejb.NoSuchObjectLocalException, but got", e);
-    }
-  }
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.java
index 35cd3d1e58..8ff7e99ccb 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -46,8 +46,4 @@ public interface TestIF {
   void retainBeanRemote() throws TestFailedException;
 
   void retainBean2Remote() throws TestFailedException;
-
-  //////////////////////////////////////////////////////////////////////
-
-  void removeTwoLocal() throws TestFailedException;
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/Client.java
index 048a20b998..6f9ac4fd05 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,9 +26,6 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome;
-
-import jakarta.ejb.EJB;
 
 public class Client extends ClientBase {
   // @EJB(name="removeBean")
@@ -43,9 +40,6 @@ public class Client extends ClientBase {
   // @EJB(name="testBean")
   private static TestIF testBean;
 
-  @EJB(name = "twoRemoteHome", lookup = "java:global/stateful_remove_complement/stateful_remove_complement_ejb/RemoveBean!com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome")
-  private static TwoRemoteHome twoRemoteHome;
-
   public static void main(String[] args) {
     Client theTests = new Client();
     Status s = theTests.run(args, System.out, System.err);
@@ -72,11 +66,6 @@ protected RemoveNotRetainIF getRemoveNotRetainBean() {
     return removeNotRetainBean;
   }
 
-  @Override
-  protected TwoRemoteHome getTwoRemoteHome() {
-    return twoRemoteHome;
-  }
-
   /*
    * @testName: removeBean
    * 
@@ -127,20 +116,4 @@ protected TwoRemoteHome getTwoRemoteHome() {
    * @test_Strategy:
    *
    */
-  /*
-   * @testName: removeTwoRemoteHome
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: removeTwoRemoteHomeHandle
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveBean.java
index 7f25c8d556..9e081e1dfe 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,24 +27,17 @@
 import com.sun.ts.tests.ejb30.common.appexception.UncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.Remove;
 
 //@Stateful(name="RemoveBean")
 //@Remote({RemoveIF.class, Remove2IF.class})
 //@Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class RemoveBean
     implements RemoveIF, Remove2IF, RemoveLocal2IF, RemoveLocalIF {
   public RemoveBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveNotRetainBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveNotRetainBean.java
index 7aaca20dc0..865dd48613 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveNotRetainBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/RemoveNotRetainBean.java
@@ -25,22 +25,15 @@
 import com.sun.ts.tests.ejb30.common.appexception.UncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.Remove;
 
 //@Stateful(name="RemoveNotRetainBean")
 //@Remote({RemoveNotRetainIF.class})
-//@Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class RemoveNotRetainBean implements RemoveNotRetainIF {
   public RemoveNotRetainBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/build.xml
index d7970ffbb7..a34cd0b1c5 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -36,10 +36,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocal2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocalIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
@@ -57,8 +53,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/Remove2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveNotRetainIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_client.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_client.xml
index fc015de82f..381f53eeab 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_client.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,56 +18,48 @@
 -->
 
 <application-client xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="10" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd">
-<ejb-ref>
-<ejb-ref-name>removeBean</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</remote>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
-<injection-target-name>removeBean</injection-target-name>
-</injection-target>
-<lookup-name>
-java:app/stateful_remove_complement_ejb/RemoveBean!com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF
-</lookup-name>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeBean</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</remote>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
+      <injection-target-name>removeBean</injection-target-name>
+    </injection-target>
+    <lookup-name>java:app/stateful_remove_complement_ejb/RemoveBean!com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</lookup-name>
+  </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>removeBean2</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</remote>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
-<injection-target-name>removeBean2</injection-target-name>
-</injection-target>
-<lookup-name>
-java:app/stateful_remove_complement_ejb/RemoveBean!com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF
-</lookup-name>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeBean2</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</remote>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
+      <injection-target-name>removeBean2</injection-target-name>
+    </injection-target>
+    <lookup-name>java:app/stateful_remove_complement_ejb/RemoveBean!com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</lookup-name>
+  </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>removeNotRetainBean</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</remote>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
-<injection-target-name>removeNotRetainBean</injection-target-name>
-</injection-target>
-<lookup-name>
-java:app/stateful_remove_complement_ejb/RemoveNotRetainBean!com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF
-</lookup-name>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeNotRetainBean</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</remote>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
+      <injection-target-name>removeNotRetainBean</injection-target-name>
+    </injection-target>
+    <lookup-name>java:app/stateful_remove_complement_ejb/RemoveNotRetainBean!com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</lookup-name>
+  </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>testBean</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF</remote>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
-<injection-target-name>testBean</injection-target-name>
-</injection-target>
-<lookup-name>
-java:global/stateful_remove_complement/stateful_remove_complement_ejb/StatelessTestBean
-</lookup-name>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>testBean</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF</remote>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.complement.Client</injection-target-class>
+      <injection-target-name>testBean</injection-target-name>
+    </injection-target>
+    <lookup-name>java:global/stateful_remove_complement/stateful_remove_complement_ejb/StatelessTestBean</lookup-name>
+  </ejb-ref>
 
 </application-client>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_ejb.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_ejb.xml
index b4f86be0a0..184f1f17b3 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_ejb.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/complement/stateful_remove_complement_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,10 +21,6 @@
     <enterprise-beans>
         <session>
             <ejb-name>RemoveBean</ejb-name>
-            <home>com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome</home>
-            <remote>com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteIF</remote>
-            <local-home>com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome</local-home>
-            <local>com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalIF</local>
             <business-local>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocalIF</business-local>
             <business-local>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocal2IF</business-local>
             <business-remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</business-remote>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/Client.java
index 672dddbe68..00e2d8cdfe 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,9 +28,7 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome;
 
-import jakarta.ejb.EJB;
 import jakarta.ejb.NoSuchEJBException;
 
 public class Client extends ClientBase {
@@ -46,9 +44,6 @@ public class Client extends ClientBase {
   // @EJB(name="testBean")
   private static TestIF testBean;
 
-  @EJB(name = "twoRemoteHome")
-  private static TwoRemoteHome twoRemoteHome;
-
   public static void main(String[] args) {
     Client theTests = new Client();
     Status s = theTests.run(args, System.out, System.err);
@@ -71,10 +66,6 @@ protected RemoveNotRetainIF getRemoveNotRetainBean() {
     return removeNotRetainBean;
   }
 
-  protected TwoRemoteHome getTwoRemoteHome() {
-    return twoRemoteHome;
-  }
-
   /*
    * @testName: removeBean
    * 
@@ -168,31 +159,6 @@ protected TwoRemoteHome getTwoRemoteHome() {
    *
    */
 
-  /*
-   * @testName: removeTwoRemoteHome
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: removeTwoRemoteHomeHandle
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: testBeanRemoveTwoLocal
-   * 
-   * @assertion_ids:
-   * 
-   * @test_Strategy:
-   *
-   */
-
   /*
    * @testName: testBeanremoveBeanRemote
    * 
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveBean.java
index ee67710523..29855a6f06 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,15 +27,12 @@
 import com.sun.ts.tests.ejb30.common.appexception.UncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.SessionContext;
 
 //@Stateful(name="RemoveBean")
 //@Remote({RemoveIF.class, Remove2IF.class})
 //@Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class RemoveBean
     implements RemoveIF, Remove2IF, RemoveLocal2IF, RemoveLocalIF {
   private SessionContext sessionContext;
@@ -43,10 +40,6 @@ public class RemoveBean
   public RemoveBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveNotRetainBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveNotRetainBean.java
index 75877f9ab3..79f188cdcc 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveNotRetainBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/RemoveNotRetainBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,15 +26,11 @@
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
 import jakarta.annotation.Resource;
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.SessionContext;
 
 //@Stateful(name="RemoveNotRetainBean")
 //@Remote({RemoveNotRetainIF.class})
-//@Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class RemoveNotRetainBean implements RemoveNotRetainIF {
   @Resource(name = "sessionContext")
   private SessionContext sessionContext;
@@ -42,9 +38,6 @@ public class RemoveNotRetainBean implements RemoveNotRetainIF {
   public RemoveNotRetainBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/StatelessTestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/StatelessTestBean.java
index e67b0e11d7..7ed77ae7b7 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/StatelessTestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/StatelessTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,7 +28,6 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome;
 
 import jakarta.ejb.EJB;
 import jakarta.ejb.NoSuchEJBException;
@@ -52,9 +51,6 @@ public class StatelessTestBean extends TestBeanBase implements TestIF {
   @EJB(name = "removeBean2Remote")
   private Remove2IF removeBean2Remote;
 
-  @EJB(name = "twoLocalHome")
-  private TwoLocalHome twoLocalHome;
-
   public void remove() {
   }
 
@@ -68,10 +64,6 @@ protected RemoveLocal2IF getRemoveLocalBean2() {
     return (RemoveLocal2IF) (sessionContext.lookup("removeBean2"));
   }
 
-  protected TwoLocalHome getTwoLocalHome() {
-    return (TwoLocalHome) (sessionContext.lookup("twoLocalHome"));
-  }
-
   protected void setRemoveLocalBean(RemoveLocalIF b) {
     this.removeBean = b;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/build.xml
index 3f7d49451a..9db9b4d2bd 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,10 +37,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocal2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocalIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
@@ -58,8 +54,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/Remove2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveNotRetainIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.jar.sun-application-client.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.jar.sun-application-client.xml
index 40e7e97b87..05f86b8d41 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.jar.sun-application-client.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.jar.sun-application-client.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Application Client 5.0//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client_5_0-0.dtd">
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,11 +29,6 @@
 <jndi-name>stateful_remove_descriptor_RemoveBean</jndi-name>
 </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>twoRemoteHome</ejb-ref-name>
-<jndi-name>stateful_remove_descriptor_RemoveBean</jndi-name>
-</ejb-ref>
-
 <ejb-ref>
 <ejb-ref-name>testBean</ejb-ref-name>
 <jndi-name>stateful_remove_descriptor_StatelessTestBean</jndi-name>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.xml
index 90f9b418a5..5420c4ad56 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,47 +18,47 @@
 -->
 
 <application-client xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="10" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd">
-<ejb-ref>
-<ejb-ref-name>removeBean</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</remote>
-<ejb-link>stateful_remove_descriptor_ejb.jar#RemoveBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
-<injection-target-name>removeBean</injection-target-name>
-</injection-target>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeBean</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</remote>
+    <ejb-link>stateful_remove_descriptor_ejb.jar#RemoveBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
+      <injection-target-name>removeBean</injection-target-name>
+    </injection-target>
+  </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>removeBean2</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</remote>
-<ejb-link>stateful_remove_descriptor_ejb.jar#RemoveBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
-<injection-target-name>removeBean2</injection-target-name>
-</injection-target>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeBean2</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</remote>
+    <ejb-link>stateful_remove_descriptor_ejb.jar#RemoveBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
+      <injection-target-name>removeBean2</injection-target-name>
+    </injection-target>
+  </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>removeNotRetainBean</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</remote>
-<ejb-link>stateful_remove_descriptor_ejb.jar#RemoveNotRetainBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
-<injection-target-name>removeNotRetainBean</injection-target-name>
-</injection-target>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeNotRetainBean</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</remote>
+    <ejb-link>stateful_remove_descriptor_ejb.jar#RemoveNotRetainBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
+      <injection-target-name>removeNotRetainBean</injection-target-name>
+    </injection-target>
+  </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>testBean</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF</remote>
-<ejb-link>stateful_remove_descriptor_ejb.jar#StatelessTestBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
-<injection-target-name>testBean</injection-target-name>
-</injection-target>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>testBean</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF</remote>
+    <ejb-link>stateful_remove_descriptor_ejb.jar#StatelessTestBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.descriptor.Client</injection-target-class>
+      <injection-target-name>testBean</injection-target-name>
+    </injection-target>
+  </ejb-ref>
 </application-client>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_ejb.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_ejb.xml
index dc955bb58a..88b9e19bd1 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_ejb.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/descriptor/stateful_remove_descriptor_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,10 +21,6 @@
     <enterprise-beans>
         <session>
             <ejb-name>RemoveBean</ejb-name>
-            <home>com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome</home>
-            <remote>com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteIF</remote>
-            <local-home>com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome</local-home>
-            <local>com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalIF</local>
             <business-local>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocalIF</business-local>
             <business-local>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocal2IF</business-local>
             <business-remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</business-remote>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/Client.java
index fcdf5893e5..5343d82a33 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,9 +26,6 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome;
-
-import jakarta.ejb.EJB;
 
 public class Client extends ClientBase {
   // @EJB(name="removeBean")
@@ -43,9 +40,6 @@ public class Client extends ClientBase {
   // @EJB(name="testBean")
   private static TestIF testBean;
 
-  @EJB(name = "twoRemoteHome")
-  private static TwoRemoteHome twoRemoteHome;
-
   public static void main(String[] args) {
     Client theTests = new Client();
     Status s = theTests.run(args, System.out, System.err);
@@ -68,10 +62,6 @@ protected RemoveNotRetainIF getRemoveNotRetainBean() {
     return removeNotRetainBean;
   }
 
-  protected TwoRemoteHome getTwoRemoteHome() {
-    return twoRemoteHome;
-  }
-
   /*
    * @testName: retainBean
    * 
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveBean.java
index e7d4fb5cea..7e0fc45c5b 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,7 +27,6 @@
 import com.sun.ts.tests.ejb30.common.appexception.UncheckedAppException;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionContext;
@@ -35,8 +34,6 @@
 //@Stateful(name="RemoveBean")
 //@Remote({RemoveIF.class, Remove2IF.class})
 //@Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class RemoveBean
     implements RemoveIF, Remove2IF, RemoveLocal2IF, RemoveLocalIF {
   private SessionContext sessionContext;
@@ -44,10 +41,6 @@ public class RemoveBean
   public RemoveBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveNotRetainBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveNotRetainBean.java
index f8a4c28249..e36311556b 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveNotRetainBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/RemoveNotRetainBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,16 +26,12 @@
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
 import jakarta.annotation.Resource;
-import jakarta.ejb.CreateException;
 import jakarta.ejb.Init;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionContext;
 
 //@Stateful(name="RemoveNotRetainBean")
 //@Remote({RemoveNotRetainIF.class})
-//@Local({RemoveLocalIF.class, RemoveLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class RemoveNotRetainBean implements RemoveNotRetainIF {
   @Resource(name = "sessionContext")
   private SessionContext sessionContext;
@@ -43,9 +39,6 @@ public class RemoveNotRetainBean implements RemoveNotRetainIF {
   public RemoveNotRetainBean() {
   }
 
-  public void ejbCreate() throws CreateException {
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/StatelessTestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/StatelessTestBean.java
index 41ff1cb026..01af4bf769 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/StatelessTestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/StatelessTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,7 +26,6 @@
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocalIF;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestBeanBase;
 import com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF;
-import com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome;
 
 import jakarta.ejb.EJB;
 import jakarta.ejb.SessionContext;
@@ -49,9 +48,6 @@ public class StatelessTestBean extends TestBeanBase implements TestIF {
   @EJB(name = "removeBean2Remote")
   private Remove2IF removeBean2Remote;
 
-  @EJB(name = "twoLocalHome")
-  private TwoLocalHome twoLocalHome;
-
   public void remove() {
   }
 
@@ -65,10 +61,6 @@ protected RemoveLocal2IF getRemoveLocalBean2() {
     return (RemoveLocal2IF) (sessionContext.lookup("removeBean2"));
   }
 
-  protected TwoLocalHome getTwoLocalHome() {
-    return (TwoLocalHome) (sessionContext.lookup("twoLocalHome"));
-  }
-
   protected void setRemoveLocalBean(RemoveLocalIF b) {
     this.removeBean = b;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/build.xml
index 60bfce960d..c56eda8344 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -35,10 +35,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocal2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveLocalIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestBeanBase.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
@@ -56,8 +52,6 @@ com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/Remove2IF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/TestIF.class,
 com/sun/ts/tests/ejb30/bb/session/stateful/remove/common/RemoveNotRetainIF.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/migration/twothree/TwoRemoteIF.class,
 com/sun/ts/tests/ejb30/common/helper/TLogger.class,
 com/sun/ts/tests/ejb30/common/helper/TestFailedException.class
             "/>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.jar.sun-application-client.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.jar.sun-application-client.xml
index 2b80072794..6d9f77ebe5 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.jar.sun-application-client.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.jar.sun-application-client.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Application Client 5.0//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client_5_0-0.dtd">
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,11 +29,6 @@
 <jndi-name>stateful_remove_override_RemoveBean</jndi-name>
 </ejb-ref>
 
-<ejb-ref>
-<ejb-ref-name>twoRemoteHome</ejb-ref-name>
-<jndi-name>stateful_remove_override_RemoveBean</jndi-name>
-</ejb-ref>
-
 <ejb-ref>
 <ejb-ref-name>testBean</ejb-ref-name>
 <jndi-name>stateful_remove_override_StatelessTestBean</jndi-name>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.xml
index 4a96681164..ac19f366e3 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,43 +18,43 @@
 -->
 
 <application-client xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="10" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd">
-<ejb-ref>
-<ejb-ref-name>removeBean</ejb-ref-name>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</remote>
-<ejb-link>stateful_remove_override_ejb.jar#RemoveBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
-<injection-target-name>removeBean</injection-target-name>
-</injection-target>
-</ejb-ref>
-
-<ejb-ref>
-<ejb-ref-name>removeBean2</ejb-ref-name>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</remote>
-<ejb-link>stateful_remove_override_ejb.jar#RemoveBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
-<injection-target-name>removeBean2</injection-target-name>
-</injection-target>
-</ejb-ref>
-
-<ejb-ref>
-<ejb-ref-name>removeNotRetainBean</ejb-ref-name>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</remote>
-<ejb-link>stateful_remove_override_ejb.jar#RemoveNotRetainBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
-<injection-target-name>removeNotRetainBean</injection-target-name>
-</injection-target>
-</ejb-ref>
-
-<ejb-ref>
-<ejb-ref-name>testBean</ejb-ref-name>
-<remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF</remote>
-<ejb-link>stateful_remove_override_ejb.jar#StatelessTestBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
-<injection-target-name>testBean</injection-target-name>
-</injection-target>
-</ejb-ref>
+  <ejb-ref>
+    <ejb-ref-name>removeBean</ejb-ref-name>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveIF</remote>
+    <ejb-link>stateful_remove_override_ejb.jar#RemoveBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
+      <injection-target-name>removeBean</injection-target-name>
+    </injection-target>
+  </ejb-ref>
+
+  <ejb-ref>
+    <ejb-ref-name>removeBean2</ejb-ref-name>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</remote>
+    <ejb-link>stateful_remove_override_ejb.jar#RemoveBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
+      <injection-target-name>removeBean2</injection-target-name>
+    </injection-target>
+  </ejb-ref>
+
+  <ejb-ref>
+    <ejb-ref-name>removeNotRetainBean</ejb-ref-name>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveNotRetainIF</remote>
+    <ejb-link>stateful_remove_override_ejb.jar#RemoveNotRetainBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
+      <injection-target-name>removeNotRetainBean</injection-target-name>
+    </injection-target>
+  </ejb-ref>
+
+  <ejb-ref>
+    <ejb-ref-name>testBean</ejb-ref-name>
+    <remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.TestIF</remote>
+    <ejb-link>stateful_remove_override_ejb.jar#StatelessTestBean</ejb-link>
+    <injection-target>
+      <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.remove.override.Client</injection-target-class>
+      <injection-target-name>testBean</injection-target-name>
+    </injection-target>
+  </ejb-ref>
 </application-client>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_ejb.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_ejb.xml
index 76e26d1270..541fd7b435 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_ejb.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/remove/override/stateful_remove_override_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,10 +21,6 @@
     <enterprise-beans>
         <session>
             <ejb-name>RemoveBean</ejb-name>
-            <home>com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteHome</home>
-            <remote>com.sun.ts.tests.ejb30.common.migration.twothree.TwoRemoteIF</remote>
-            <local-home>com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalHome</local-home>
-            <local>com.sun.ts.tests.ejb30.common.migration.twothree.TwoLocalIF</local>
             <business-local>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocalIF</business-local>
             <business-local>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.RemoveLocal2IF</business-local>
             <business-remote>com.sun.ts.tests.ejb30.bb.session.stateful.remove.common.Remove2IF</business-remote>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/Client.java
index d4d4448e82..80799a350b 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,8 +20,6 @@
 
 package com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.annotated;
 
-import java.rmi.RemoteException;
-
 import com.sun.javatest.Status;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 import com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF;
@@ -29,10 +27,7 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestIF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteIF;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJB;
 
 public class Client extends ClientBase {
@@ -45,9 +40,6 @@ public class Client extends ClientBase {
   @EJB(name = "testBean")
   private static TestIF testBean;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private static TwoRemoteHome twoSessionContextBeanHome;
-
   @EJB(name = "acceptBean")
   private static AcceptIF acceptBean;
 
@@ -63,18 +55,6 @@ protected TestIF getTestBean() {
     return testBean;
   }
 
-  protected TwoRemoteIF getTwoSessionContextBean() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanHome.create();
-    } catch (RemoteException e) {
-      throw new TestFailedException(e);
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoRemoteIF) obj;
-  }
-
   protected AcceptIF getAcceptBean() {
     return acceptBean;
   }
@@ -218,23 +198,4 @@ public static void main(String[] args) {
    * @test_Strategy:
    *
    */
-
-  /*
-   * @testName: getInvokedBusinessInterfaceRemoteIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:10; EJB:JAVADOC:11; EJB:JAVADOC:171;
-   * EJB:JAVADOC:148
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: getInvokedBusinessInterfaceLocalIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:171; EJB:JAVADOC:126
-   * 
-   * @test_Strategy:
-   *
-   */
-
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/SessionContextBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/SessionContextBean.java
index 8b871e0549..b7cab4ed60 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/SessionContextBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/SessionContextBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,15 +26,11 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome;
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.Init;
 import jakarta.ejb.Local;
-import jakarta.ejb.LocalHome;
 import jakarta.ejb.Remote;
-import jakarta.ejb.RemoteHome;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateful;
@@ -44,8 +40,6 @@
 @Stateful(name = "SessionContextBean")
 @Remote({ Three1IF.class, Three2IF.class })
 @Local({ ThreeLocal1IF.class, ThreeLocal2IF.class })
-@RemoteHome(TwoRemoteHome.class)
-@LocalHome(TwoLocalHome.class)
 // use bmt so that it can be safely removed from the calling bean (TestBean)
 @TransactionManagement(TransactionManagementType.BEAN)
 public class SessionContextBean extends SessionContextBeanBase
@@ -67,14 +61,6 @@ public SessionContextBean() {
   public void remove() {
   }
 
-  //////////////////////////////////////////////////////////////////////
-  // optional ejbCreate() method because this bean has RemoteHome
-  // it may throw any application exception, and possibly CreateException
-  //////////////////////////////////////////////////////////////////////
-  public void ejbCreate() throws TestFailedException {
-
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/TestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/TestBean.java
index d6d4313bdb..c3d0683ed8 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/TestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,11 +26,8 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestIF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalIF;
 
 import jakarta.annotation.Resource;
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Remove;
@@ -52,19 +49,6 @@ public class TestBean extends TestBeanBase {
   @EJB(name = "acceptLocal")
   private AcceptLocalIF acceptLocal;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private TwoLocalHome twoSessionContextBeanLocalHome;
-
-  protected TwoLocalIF getTwoLocal() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanLocalHome.create();
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoLocalIF) obj;
-  }
-
   protected SessionContext getSessionContext() {
     return sessionContext;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/build.xml
index 103b5a113e..ad0c2ac9c6 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/annotated/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,11 +40,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <property name="appclient.jar.classes" 
@@ -63,9 +59,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <import file="../../../../../../../../../../../src/com/sun/ts/tests/ejb30/common/import.xml"/>  
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/Client.java
index 2fcd30f429..ed881a6677 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,8 +20,6 @@
 
 package com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor;
 
-import java.rmi.RemoteException;
-
 import com.sun.javatest.Status;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 import com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF;
@@ -29,11 +27,6 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestIF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteIF;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJB;
 
 public class Client extends ClientBase {
   // @EJB(name="sessionContextBean")
@@ -48,21 +41,6 @@ public class Client extends ClientBase {
   // @EJB(name="acceptBean")
   private static AcceptIF acceptBean;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private static TwoRemoteHome twoSessionContextBeanHome;
-
-  protected TwoRemoteIF getTwoSessionContextBean() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanHome.create();
-    } catch (RemoteException e) {
-      throw new TestFailedException(e);
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoRemoteIF) obj;
-  }
-
   protected Three1IF getSessionContextBean() {
     return sessionContextBean;
   }
@@ -218,21 +196,4 @@ public static void main(String[] args) {
    *
    */
 
-  /*
-   * @testName: getInvokedBusinessInterfaceRemoteIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:10; EJB:JAVADOC:11; EJB:JAVADOC:171
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: getInvokedBusinessInterfaceLocalIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:171
-   * 
-   * @test_Strategy:
-   *
-   */
-
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/SessionContextBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/SessionContextBean.java
index fa5538b543..5985a247f6 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/SessionContextBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/SessionContextBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,8 +32,6 @@
 //@Stateful(name="SessionContextBean")
 //@Remote({Three1IF.class, Three2IF.class})
 //@Local({ThreeLocal1IF.class, ThreeLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 //use bmt so that it can be safely removed from the calling bean (TestBean)
 //assembler not permitted to override transaction management type.
 @TransactionManagement(TransactionManagementType.BEAN)
@@ -56,14 +54,6 @@ public SessionContextBean() {
   public void remove() {
   }
 
-  //////////////////////////////////////////////////////////////////////
-  // optional ejbCreate() method because this bean has RemoteHome
-  // it may throw any application exception, and possibly CreateException
-  //////////////////////////////////////////////////////////////////////
-  public void ejbCreate() throws TestFailedException {
-
-  }
-
   @Init
   public void create() {
     // do nothing since our stateful beans do not need
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/TestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/TestBean.java
index 7164823348..99e9e543ad 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/TestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/TestBean.java
@@ -25,11 +25,7 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestBeanBase;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalIF;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJB;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.TransactionManagement;
@@ -53,19 +49,6 @@ public class TestBean extends TestBeanBase {
   // @EJB(name="acceptLocal")
   private AcceptLocalIF acceptLocal;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private TwoLocalHome twoSessionContextBeanLocalHome;
-
-  protected TwoLocalIF getTwoLocal() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanLocalHome.create();
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoLocalIF) obj;
-  }
-
   protected SessionContext getSessionContext() {
     return sessionContext;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/build.xml
index 48e7c1c3d9..a23868f739 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,11 +40,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <property name="appclient.jar.classes" 
@@ -63,9 +59,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <import file="../../../../../../../../../../../src/com/sun/ts/tests/ejb30/common/import.xml"/>  
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/stateful_sessioncontext_descriptor_ejb.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/stateful_sessioncontext_descriptor_ejb.xml
index e7c276ed30..a31c05ef74 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/stateful_sessioncontext_descriptor_ejb.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateful/sessioncontext/descriptor/stateful_sessioncontext_descriptor_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,102 +18,98 @@
 -->
 
 <ejb-jar xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="4.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd">
-<display-name xml:lang="en">ejb30 sessioncontext</display-name>
-<enterprise-beans>
-<session>
-<display-name xml:lang="en">ejb30 sessioncontext</display-name>
-<ejb-name>SessionContextBean</ejb-name>
-<home>com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome</home>
-<remote>com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteIF</remote>
-<local-home>com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome</local-home>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalIF</local>
-<business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</business-local>
-<business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</business-local>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF</business-remote>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF</business-remote>
-<ejb-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.SessionContextBean</ejb-class>
-<session-type>Stateful</session-type>
-<transaction-type>Bean</transaction-type>
-<resource-env-ref>
-<resource-env-ref-name>sessionContext</resource-env-ref-name>
-<resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.SessionContextBean</injection-target-class>
-<injection-target-name>sessionContext</injection-target-name>
-</injection-target>
-</resource-env-ref>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-<session>
-<display-name xml:lang="en">ejb30 sessioncontext</display-name>
-<ejb-name>AcceptBean</ejb-name>
-<business-local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</business-local>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF</business-remote>
-<ejb-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.AcceptBean</ejb-class>
-<session-type>Stateful</session-type>
-<transaction-type>Bean</transaction-type>
-<resource-env-ref>
-<resource-env-ref-name>sessionContext</resource-env-ref-name>
-<resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.AcceptBean</injection-target-class>
-<injection-target-name>sessionContext</injection-target-name>
-</injection-target>
-</resource-env-ref>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-<session>
-<display-name>TestBean</display-name>
-<ejb-name>TestBean</ejb-name>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.TestIF</business-remote>
-<ejb-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</ejb-class>
-<session-type>Stateful</session-type>
-<transaction-type>Bean</transaction-type>
-<ejb-local-ref>
-<ejb-ref-name>local2</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</local>
-<ejb-link>SessionContextBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>local2</injection-target-name>
-</injection-target>
-</ejb-local-ref>
-<ejb-local-ref>
-<ejb-ref-name>local1</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</local>
-<ejb-link>SessionContextBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>local1</injection-target-name>
-</injection-target>
-</ejb-local-ref>
-<ejb-local-ref>
-<ejb-ref-name>acceptLocal</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</local>
-<ejb-link>AcceptBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>acceptLocal</injection-target-name>
-</injection-target>
-</ejb-local-ref>
-<resource-env-ref>
-<resource-env-ref-name>sessionContext</resource-env-ref-name>
-<resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>sessionContext</injection-target-name>
-</injection-target>
-</resource-env-ref>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-</enterprise-beans>
+  <display-name xml:lang="en">ejb30 sessioncontext</display-name>
+  <enterprise-beans>
+    <session>
+      <display-name xml:lang="en">ejb30 sessioncontext</display-name>
+      <ejb-name>SessionContextBean</ejb-name>
+      <business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</business-local>
+      <business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</business-local>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF</business-remote>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF</business-remote>
+      <ejb-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.SessionContextBean</ejb-class>
+      <session-type>Stateful</session-type>
+      <transaction-type>Bean</transaction-type>
+      <resource-env-ref>
+        <resource-env-ref-name>sessionContext</resource-env-ref-name>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.SessionContextBean</injection-target-class>
+          <injection-target-name>sessionContext</injection-target-name>
+        </injection-target>
+      </resource-env-ref>
+      <security-identity>
+        <use-caller-identity/>
+      </security-identity>
+    </session>
+    <session>
+      <display-name xml:lang="en">ejb30 sessioncontext</display-name>
+      <ejb-name>AcceptBean</ejb-name>
+      <business-local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</business-local>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF</business-remote>
+      <ejb-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.AcceptBean</ejb-class>
+      <session-type>Stateful</session-type>
+      <transaction-type>Bean</transaction-type>
+      <resource-env-ref>
+        <resource-env-ref-name>sessionContext</resource-env-ref-name>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.AcceptBean</injection-target-class>
+          <injection-target-name>sessionContext</injection-target-name>
+        </injection-target>
+      </resource-env-ref>
+      <security-identity>
+        <use-caller-identity/>
+      </security-identity>
+    </session>
+    <session>
+      <display-name>TestBean</display-name>
+      <ejb-name>TestBean</ejb-name>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.TestIF</business-remote>
+      <ejb-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</ejb-class>
+      <session-type>Stateful</session-type>
+      <transaction-type>Bean</transaction-type>
+      <ejb-local-ref>
+        <ejb-ref-name>local2</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</local>
+        <ejb-link>SessionContextBean</ejb-link>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>local2</injection-target-name>
+        </injection-target>
+      </ejb-local-ref>
+      <ejb-local-ref>
+        <ejb-ref-name>local1</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</local>
+        <ejb-link>SessionContextBean</ejb-link>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>local1</injection-target-name>
+        </injection-target>
+      </ejb-local-ref>
+      <ejb-local-ref>
+        <ejb-ref-name>acceptLocal</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</local>
+        <ejb-link>AcceptBean</ejb-link>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>acceptLocal</injection-target-name>
+        </injection-target>
+      </ejb-local-ref>
+      <resource-env-ref>
+        <resource-env-ref-name>sessionContext</resource-env-ref-name>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateful.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>sessionContext</injection-target-name>
+        </injection-target>
+      </resource-env-ref>
+      <security-identity>
+        <use-caller-identity/>
+      </security-identity>
+    </session>
+  </enterprise-beans>
 </ejb-jar>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/Client.java
index 996f15feb8..6cf5184d02 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,8 +20,6 @@
 
 package com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.annotated;
 
-import java.rmi.RemoteException;
-
 import com.sun.javatest.Status;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 import com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF;
@@ -29,10 +27,7 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestIF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteIF;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJB;
 
 public class Client extends ClientBase {
@@ -42,9 +37,6 @@ public class Client extends ClientBase {
   @EJB(name = "sessionContextBean2")
   private static Three2IF sessionContextBean2;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private static TwoRemoteHome twoSessionContextBeanHome;
-
   @EJB(name = "testBean")
   private static TestIF testBean;
 
@@ -55,18 +47,6 @@ protected Three2IF getSessionContextBean2() {
     return sessionContextBean2;
   }
 
-  protected TwoRemoteIF getTwoSessionContextBean() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanHome.create();
-    } catch (RemoteException e) {
-      throw new TestFailedException(e);
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoRemoteIF) obj;
-  }
-
   protected Three1IF getSessionContextBean() {
     return sessionContextBean;
   }
@@ -211,22 +191,4 @@ public static void main(String[] args) {
    * @test_Strategy:
    *
    */
-
-  /*
-   * @testName: getInvokedBusinessInterfaceRemoteIllegal
-   * 
-   * @assertion_ids:EJB:JAVADOC:10; EJB:JAVADOC:11; EJB:JAVADOC:171
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: getInvokedBusinessInterfaceLocalIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:171; EJB:JAVADOC:126
-   * 
-   * @test_Strategy:
-   *
-   */
-
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/SessionContextBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/SessionContextBean.java
index c71751148e..c85dc29e90 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/SessionContextBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/SessionContextBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,22 +26,16 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome;
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.Local;
-import jakarta.ejb.LocalHome;
 import jakarta.ejb.Remote;
-import jakarta.ejb.RemoteHome;
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateless;
 
 @Stateless(name = "SessionContextBean")
 @Remote({ Three1IF.class, Three2IF.class })
 @Local({ ThreeLocal1IF.class, ThreeLocal2IF.class })
-@RemoteHome(TwoRemoteHome.class)
-@LocalHome(TwoLocalHome.class)
 public class SessionContextBean extends SessionContextBeanBase
 // implements Three1IF, Three2IF
 {
@@ -59,13 +53,4 @@ public SessionContextBean() {
 
   public void remove() {
   }
-
-  //////////////////////////////////////////////////////////////////////
-  // optional ejbCreate() method because this bean has RemoteHome
-  // it may throw any application exception, and possibly CreateException
-  //////////////////////////////////////////////////////////////////////
-  public void ejbCreate() throws TestFailedException {
-
-  }
-
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/TestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/TestBean.java
index 765ff7b9dc..bf00de446a 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/TestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,11 +26,8 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestIF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalIF;
 
 import jakarta.annotation.Resource;
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Remote;
 import jakarta.ejb.SessionContext;
@@ -51,19 +48,6 @@ public class TestBean extends TestBeanBase {
   @EJB(name = "acceptLocal")
   private AcceptLocalIF acceptLocal;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private TwoLocalHome twoSessionContextBeanLocalHome;
-
-  protected TwoLocalIF getTwoLocal() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanLocalHome.create();
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoLocalIF) obj;
-  }
-
   protected SessionContext getSessionContext() {
     return sessionContext;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/build.xml
index 98af2a3e40..f5c5d1f43e 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/annotated/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,11 +40,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <property name="appclient.jar.classes" 
@@ -63,9 +59,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <import file="../../../../../../../../../../../src/com/sun/ts/tests/ejb30/common/import.xml"/>  
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/Client.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/Client.java
index 2c3e7e0554..d24d953b18 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/Client.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,8 +20,6 @@
 
 package com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor;
 
-import java.rmi.RemoteException;
-
 import com.sun.javatest.Status;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 import com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF;
@@ -29,11 +27,6 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestIF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteIF;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJB;
 
 public class Client extends ClientBase {
   // @EJB(name="sessionContextBean")
@@ -48,9 +41,6 @@ public class Client extends ClientBase {
   // @EJB(name="acceptBean")
   private static AcceptIF acceptBean;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private static TwoRemoteHome twoSessionContextBeanHome;
-
   protected Three1IF getSessionContextBean() {
     return sessionContextBean;
   }
@@ -73,18 +63,6 @@ public static void main(String[] args) {
     s.exit();
   }
 
-  protected TwoRemoteIF getTwoSessionContextBean() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanHome.create();
-    } catch (RemoteException e) {
-      throw new TestFailedException(e);
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoRemoteIF) obj;
-  }
-
   //////////////////////////////////////////////////////////////////////
 
   /*
@@ -211,21 +189,4 @@ protected TwoRemoteIF getTwoSessionContextBean() throws TestFailedException {
    * @test_Strategy:
    *
    */
-
-  /*
-   * @testName: getInvokedBusinessInterfaceRemoteIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:10; EJB:JAVADOC:11; EJB:JAVADOC:171
-   * 
-   * @test_Strategy:
-   *
-   */
-  /*
-   * @testName: getInvokedBusinessInterfaceLocalIllegal
-   * 
-   * @assertion_ids: EJB:JAVADOC:171
-   * 
-   * @test_Strategy:
-   *
-   */
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/SessionContextBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/SessionContextBean.java
index ae76bcadcf..84cd4fe9b5 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/SessionContextBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/SessionContextBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,8 +27,6 @@
 //@Stateless(name="SessionContextBean")
 //@Remote({Three1IF.class, Three2IF.class})
 //@Local({ThreeLocal1IF.class, ThreeLocal2IF.class})
-//@RemoteHome(TwoRemoteHome.class)
-//@LocalHome(TwoLocalHome.class)
 public class SessionContextBean extends SessionContextBeanBase
 // implements Three1IF, Three2IF
 {
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/TestBean.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/TestBean.java
index 055b3a9081..4ce3372768 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/TestBean.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,11 +25,7 @@
 import com.sun.ts.tests.ejb30.common.sessioncontext.TestBeanBase;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF;
 import com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome;
-import com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalIF;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJB;
 import jakarta.ejb.SessionContext;
 
 //@Stateless(name="TestBean")
@@ -47,19 +43,6 @@ public class TestBean extends TestBeanBase {
   // @EJB(name="acceptLocal")
   private AcceptLocalIF acceptLocal;
 
-  @EJB(name = "twoSessionContextBeanHome")
-  private TwoLocalHome twoSessionContextBeanLocalHome;
-
-  protected TwoLocalIF getTwoLocal() throws TestFailedException {
-    Object obj = null;
-    try {
-      obj = twoSessionContextBeanLocalHome.create();
-    } catch (CreateException e) {
-      throw new TestFailedException(e);
-    }
-    return (TwoLocalIF) obj;
-  }
-
   protected SessionContext getSessionContext() {
     return sessionContext;
   }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/build.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/build.xml
index 758fa2c4fd..e75226f134 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/build.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,11 +40,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <property name="appclient.jar.classes" 
@@ -63,9 +59,7 @@ com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three1IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/Three2IF.class,
 com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal1IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.class,
-com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.class
+com/sun/ts/tests/ejb30/common/sessioncontext/ThreeLocal2IF.class
             "/>
   
   <import file="../../../../../../../../../../../src/com/sun/ts/tests/ejb30/common/import.xml"/>  
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/stateless_sessioncontext_descriptor_ejb.xml b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/stateless_sessioncontext_descriptor_ejb.xml
index a5b0aa78af..3c59256c51 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/stateless_sessioncontext_descriptor_ejb.xml
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/bb/session/stateless/sessioncontext/descriptor/stateless_sessioncontext_descriptor_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,102 +18,98 @@
 -->
 
 <ejb-jar xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="4.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd">
-<display-name xml:lang="en">ejb30 sessioncontext</display-name>
-<enterprise-beans>
-<session>
-<display-name xml:lang="en">ejb30 sessioncontext</display-name>
-<ejb-name>SessionContextBean</ejb-name>
-<home>com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteHome</home>
-<remote>com.sun.ts.tests.ejb30.common.sessioncontext.TwoRemoteIF</remote>
-<local-home>com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalHome</local-home>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.TwoLocalIF</local>
-<business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</business-local>
-<business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</business-local>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF</business-remote>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF</business-remote>
-<ejb-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.SessionContextBean</ejb-class>
-<session-type>Stateless</session-type>
-<transaction-type>Container</transaction-type>
-<resource-env-ref>
-<resource-env-ref-name>sessionContext</resource-env-ref-name>
-<resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.SessionContextBean</injection-target-class>
-<injection-target-name>sessionContext</injection-target-name>
-</injection-target>
-</resource-env-ref>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-<session>
-<display-name xml:lang="en">ejb30 sessioncontext</display-name>
-<ejb-name>AcceptBean</ejb-name>
-<business-local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</business-local>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF</business-remote>
-<ejb-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.AcceptBean</ejb-class>
-<session-type>Stateless</session-type>
-<transaction-type>Container</transaction-type>
-<resource-env-ref>
-<resource-env-ref-name>sessionContext</resource-env-ref-name>
-<resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.AcceptBean</injection-target-class>
-<injection-target-name>sessionContext</injection-target-name>
-</injection-target>
-</resource-env-ref>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-<session>
-<display-name>TestBean</display-name>
-<ejb-name>TestBean</ejb-name>
-<business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.TestIF</business-remote>
-<ejb-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</ejb-class>
-<session-type>Stateless</session-type>
-<transaction-type>Container</transaction-type>
-<ejb-local-ref>
-<ejb-ref-name>local2</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</local>
-<ejb-link>SessionContextBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>local2</injection-target-name>
-</injection-target>
-</ejb-local-ref>
-<ejb-local-ref>
-<ejb-ref-name>local1</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</local>
-<ejb-link>SessionContextBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>local1</injection-target-name>
-</injection-target>
-</ejb-local-ref>
-<ejb-local-ref>
-<ejb-ref-name>acceptLocal</ejb-ref-name>
-<ejb-ref-type>Session</ejb-ref-type>
-<local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</local>
-<ejb-link>AcceptBean</ejb-link>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>acceptLocal</injection-target-name>
-</injection-target>
-</ejb-local-ref>
-<resource-env-ref>
-<resource-env-ref-name>sessionContext</resource-env-ref-name>
-<resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
-<injection-target>
-<injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
-<injection-target-name>sessionContext</injection-target-name>
-</injection-target>
-</resource-env-ref>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-</enterprise-beans>
+  <display-name xml:lang="en">ejb30 sessioncontext</display-name>
+  <enterprise-beans>
+    <session>
+      <display-name xml:lang="en">ejb30 sessioncontext</display-name>
+      <ejb-name>SessionContextBean</ejb-name>
+      <business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</business-local>
+      <business-local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</business-local>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three2IF</business-remote>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.Three1IF</business-remote>
+      <ejb-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.SessionContextBean</ejb-class>
+      <session-type>Stateless</session-type>
+      <transaction-type>Container</transaction-type>
+      <resource-env-ref>
+        <resource-env-ref-name>sessionContext</resource-env-ref-name>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.SessionContextBean</injection-target-class>
+          <injection-target-name>sessionContext</injection-target-name>
+        </injection-target>
+      </resource-env-ref>
+      <security-identity>
+        <use-caller-identity/>
+      </security-identity>
+    </session>
+    <session>
+      <display-name xml:lang="en">ejb30 sessioncontext</display-name>
+      <ejb-name>AcceptBean</ejb-name>
+      <business-local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</business-local>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptIF</business-remote>
+      <ejb-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.AcceptBean</ejb-class>
+      <session-type>Stateless</session-type>
+      <transaction-type>Container</transaction-type>
+      <resource-env-ref>
+        <resource-env-ref-name>sessionContext</resource-env-ref-name>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.AcceptBean</injection-target-class>
+          <injection-target-name>sessionContext</injection-target-name>
+        </injection-target>
+      </resource-env-ref>
+      <security-identity>
+        <use-caller-identity/>
+      </security-identity>
+    </session>
+    <session>
+      <display-name>TestBean</display-name>
+      <ejb-name>TestBean</ejb-name>
+      <business-remote>com.sun.ts.tests.ejb30.common.sessioncontext.TestIF</business-remote>
+      <ejb-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</ejb-class>
+      <session-type>Stateless</session-type>
+      <transaction-type>Container</transaction-type>
+      <ejb-local-ref>
+        <ejb-ref-name>local2</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal2IF</local>
+        <ejb-link>SessionContextBean</ejb-link>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>local2</injection-target-name>
+        </injection-target>
+      </ejb-local-ref>
+      <ejb-local-ref>
+        <ejb-ref-name>local1</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.sun.ts.tests.ejb30.common.sessioncontext.ThreeLocal1IF</local>
+        <ejb-link>SessionContextBean</ejb-link>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>local1</injection-target-name>
+        </injection-target>
+      </ejb-local-ref>
+      <ejb-local-ref>
+        <ejb-ref-name>acceptLocal</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.sun.ts.tests.ejb30.common.sessioncontext.AcceptLocalIF</local>
+        <ejb-link>AcceptBean</ejb-link>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>acceptLocal</injection-target-name>
+        </injection-target>
+      </ejb-local-ref>
+      <resource-env-ref>
+        <resource-env-ref-name>sessionContext</resource-env-ref-name>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
+        <injection-target>
+          <injection-target-class>com.sun.ts.tests.ejb30.bb.session.stateless.sessioncontext.descriptor.TestBean</injection-target-class>
+          <injection-target-name>sessionContext</injection-target-name>
+        </injection-target>
+      </resource-env-ref>
+      <security-identity>
+        <use-caller-identity/>
+      </security-identity>
+    </session>
+  </enterprise-beans>
 </ejb-jar>
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/ClientBase.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/ClientBase.java
index 8e25abb932..3c92f06fcf 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/ClientBase.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/ClientBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,7 +20,6 @@
 
 package com.sun.ts.tests.ejb30.common.sessioncontext;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 
 import com.sun.ts.lib.harness.EETest;
@@ -34,9 +33,6 @@ abstract public class ClientBase extends EETest {
 
   abstract protected Three2IF getSessionContextBean2();
 
-  abstract protected TwoRemoteIF getTwoSessionContextBean()
-      throws TestFailedException;
-
   abstract protected TestIF getTestBean();
 
   abstract protected AcceptIF getAcceptBean();
@@ -325,35 +321,4 @@ public void getInvokedBusinessInterfaceLocal2() throws Exception {
       throw new Exception(e);
     }
   }
-
-  /*
-   * testName: getInvokedBusinessInterfaceRemoteIllegal
-   * 
-   * @test_Strategy:
-   *
-   */
-  public void getInvokedBusinessInterfaceRemoteIllegal() throws Exception {
-    try {
-      TwoRemoteIF twoSessionContextBean = getTwoSessionContextBean();
-      twoSessionContextBean.getInvokedBusinessInterfaceRemoteIllegal();
-    } catch (TestFailedException e) {
-      throw new Exception(e);
-    } catch (RemoteException e) {
-      throw new Exception(e);
-    }
-  }
-
-  /*
-   * testName: getInvokedBusinessInterfaceLocalIllegal
-   * 
-   * @test_Strategy:
-   *
-   */
-  public void getInvokedBusinessInterfaceLocalIllegal() throws Exception {
-    try {
-      testBean.getInvokedBusinessInterfaceLocalIllegal();
-    } catch (TestFailedException e) {
-      throw new Exception(e);
-    }
-  }
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/SessionContextBeanBase.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/SessionContextBeanBase.java
index 36b39d0ef0..d99b336062 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/SessionContextBeanBase.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/SessionContextBeanBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -91,12 +91,6 @@ public Class getInvokedBusinessInterfaceLocal2() throws TestFailedException {
     return getInvokedBusinessInterface();
   }
 
-  //////////////////////////////////////////////////////////////////////
-  // TwoRemoteIF methods
-  //////////////////////////////////////////////////////////////////////
-  //////////////////////////////////////////////////////////////////////
-  // TwoLocalIF methods
-  //////////////////////////////////////////////////////////////////////
   public void noop() {
   }
 
@@ -120,7 +114,6 @@ public void getInvokedBusinessInterfaceLocalIllegal() {
     getInvokedBusinessInterfaceRemoteIllegal();
   }
 
-  //////////////////////////////////////////////////////////////////////
   private void getBusinessObject1Illegal() throws TestFailedException {
     try {
       getSessionContext().getBusinessObject(Object.class);
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestBeanBase.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestBeanBase.java
index 4d694bac83..ba3e804f90 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestBeanBase.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestBeanBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,6 @@
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 
-import jakarta.ejb.EJBException;
 import jakarta.ejb.SessionContext;
 
 abstract public class TestBeanBase implements TestIF {
@@ -33,8 +32,6 @@ abstract public class TestBeanBase implements TestIF {
 
   abstract protected ThreeLocal2IF getLocal2();
 
-  abstract protected TwoLocalIF getTwoLocal() throws TestFailedException;
-
   abstract protected AcceptLocalIF getAcceptLocalBean();
 
   public void getBusinessObjectLocal1() throws TestFailedException {
@@ -193,14 +190,4 @@ public void lookupIllegalArgumentException() throws TestFailedException {
           + "a non-existent name: " + lookupName);
     }
   }
-
-  public void getInvokedBusinessInterfaceLocalIllegal()
-      throws TestFailedException {
-    TwoLocalIF twoSessionContextBean = getTwoLocal();
-    try {
-      twoSessionContextBean.getInvokedBusinessInterfaceLocalIllegal();
-    } catch (EJBException e) {
-      throw new TestFailedException(e);
-    }
-  }
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.java
index af1f966fe9..b7ee9add77 100644
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.java
+++ b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TestIF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -41,7 +41,4 @@ public abstract void lookupIllegalArgumentException()
       throws TestFailedException;
 
   public void getBusinessObjectLocal1Illegal() throws TestFailedException;
-
-  public void getInvokedBusinessInterfaceLocalIllegal()
-      throws TestFailedException;
 }
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.java
deleted file mode 100644
index 5869dbcd0f..0000000000
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalHome.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.ejb30.common.sessioncontext;
-
-import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBLocalHome;
-
-public interface TwoLocalHome extends EJBLocalHome {
-  public TwoLocalIF create() throws CreateException, TestFailedException;
-
-}
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.java
deleted file mode 100644
index 8995c3175e..0000000000
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoLocalIF.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.ejb30.common.sessioncontext;
-
-import jakarta.ejb.EJBLocalObject;
-
-public interface TwoLocalIF extends EJBLocalObject {
-  public void noop();
-
-  public void getInvokedBusinessInterfaceLocalIllegal();
-}
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.java
deleted file mode 100644
index 6e6a4acd27..0000000000
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteHome.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.ejb30.common.sessioncontext;
-
-import java.rmi.RemoteException;
-
-import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TwoRemoteHome extends EJBHome {
-  public TwoRemoteIF create()
-      throws RemoteException, CreateException, TestFailedException;
-
-}
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.java
deleted file mode 100644
index 28ce6184ae..0000000000
--- a/ejb30/src/main/java/com/sun/ts/tests/ejb30/common/sessioncontext/TwoRemoteIF.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.ejb30.common.sessioncontext;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.EJBObject;
-
-public interface TwoRemoteIF extends EJBObject {
-  public void noop() throws RemoteException;
-
-  public void getInvokedBusinessInterfaceRemoteIllegal() throws RemoteException;
-}
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1.java b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1.java
index e13c11085b..9c34224014 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,14 +20,10 @@
 
 package com.sun.ts.tests.integration.sec.propagation;
 
-import java.rmi.RemoteException;
+public interface Bean1 {
+  public String getCallerPrincipalName();
 
-import jakarta.ejb.EJBObject;
+  public String getPropagatedPrincipalName();
 
-public interface Bean1 extends EJBObject {
-  public String getCallerPrincipalName() throws RemoteException;
-
-  public String getPropagatedPrincipalName() throws RemoteException;
-
-  public String Test() throws RemoteException;
+  public String Test();
 }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1EJB.java b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1EJB.java
index b335c34f2b..aae07d01bf 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1EJB.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1EJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,18 +24,14 @@
 import com.sun.ts.lib.util.TSNamingContextInterface;
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
+import jakarta.annotation.Resource;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
 import jakarta.ejb.SessionContext;
 
-public class Bean1EJB implements SessionBean {
+public class Bean1EJB {
 
-  private SessionContext sessionContext = null;
-
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate OK");
-  }
+  @Resource
+  private SessionContext sessionContext;
 
   /**
    * Returns the name of the caller principal
@@ -55,16 +51,12 @@ public String getPropagatedPrincipalName() {
       TSNamingContextInterface nctx = null;
       String testLookup = "java:comp/env/ejb/Bean2";
 
-      Bean2Home bean2Home = null;
       Bean2 bean2Ref = null;
 
       nctx = new TSNamingContext();
-      bean2Home = (Bean2Home) nctx.lookup(testLookup, Bean2Home.class);
-      bean2Ref = bean2Home.create();
+      bean2Ref = (Bean2) nctx.lookup(testLookup, Bean2.class);
 
       result = bean2Ref.getCallerPrincipalName();
-
-      bean2Ref.remove();
     } catch (Exception e) {
       TestUtil.printStackTrace(e);
       throw new EJBException("Exception: " + e.getMessage());
@@ -76,24 +68,4 @@ public String getPropagatedPrincipalName() {
   public String Test() {
     return "true";
   }
-
-  public void setSessionContext(SessionContext sc) {
-    sessionContext = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
 }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1Home.java b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1Home.java
deleted file mode 100644
index 2ee6e06fdb..0000000000
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean1Home.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.integration.sec.propagation;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Bean1Home extends EJBHome {
-  Bean1 create() throws RemoteException, CreateException;
-}
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2.java b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2.java
index 0c8b62a4ee..ce392e42f5 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,10 +20,6 @@
 
 package com.sun.ts.tests.integration.sec.propagation;
 
-import java.rmi.RemoteException;
-
-import jakarta.ejb.EJBObject;
-
-public interface Bean2 extends EJBObject {
-  public String getCallerPrincipalName() throws RemoteException;
+public interface Bean2 {
+  public String getCallerPrincipalName();
 }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2EJB.java b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2EJB.java
index d3707ded6d..372402463c 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2EJB.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2EJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,17 +22,13 @@
 
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
+import jakarta.annotation.Resource;
 import jakarta.ejb.SessionContext;
 
-public class Bean2EJB implements SessionBean {
+public class Bean2EJB {
 
-  private SessionContext sessionContext = null;
-
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate OK");
-  }
+  @Resource
+  private SessionContext sessionContext;
 
   /**
    * Returns the name of the caller principal
@@ -40,24 +36,4 @@ public void ejbCreate() throws CreateException {
   public String getCallerPrincipalName() {
     return sessionContext.getCallerPrincipal().getName();
   }
-
-  public void setSessionContext(SessionContext sc) {
-    sessionContext = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
 }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2Home.java b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2Home.java
deleted file mode 100644
index b09cd42e3b..0000000000
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/Bean2Home.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.integration.sec.propagation;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Bean2Home extends EJBHome {
-  Bean2 create() throws RemoteException, CreateException;
-}
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/build.xml b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/build.xml
index a8e8db1487..88990f3425 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/build.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,7 +26,7 @@
         <fileset dir="${class.dir}" includes="com/sun/ts/tests/ejb/ee/bb/entity/util/DBSupport.class"/>
       </ts.ejbjar>
       <ts.war descriptor="integration_sec_propagation_web.xml" archivename="integration_sec_propagation"
-              excludedfiles="com/sun/ts/tests/integration/sec/propagation/Bean1EJB.class, com/sun/ts/tests/integration/sec/propagation/Bean2.class, com/sun/ts/tests/integration/sec/propagation/Bean2EJB.class, com/sun/ts/tests/integration/sec/propagation/Bean2Home.class">
+              excludedfiles="com/sun/ts/tests/integration/sec/propagation/Bean1EJB.class, com/sun/ts/tests/integration/sec/propagation/Bean2.class, com/sun/ts/tests/integration/sec/propagation/Bean2EJB.class">
         <zipfileset dir="${class.dir}" includes="com/sun/ts/tests/ejb/ee/bb/entity/util/DBSupport.class"
                     prefix="WEB-INF/classes"/>
         <zipfileset dir="." includes="*.jsp, *.html"/>
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/ejb_to_ejb.jsp b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/ejb_to_ejb.jsp
index 2f782a2b7a..f057a8c17c 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/ejb_to_ejb.jsp
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/ejb_to_ejb.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2006, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,7 +38,6 @@
 
     String testLookup1 = "java:comp/env/ejb/Bean1";
 
-    Bean1Home   bean1Home = null;
     Bean1       bean1Ref  = null;
 
     String web = null;
@@ -52,11 +51,9 @@
     try {
         nctx = new TSNamingContext();
 
-	bean1Home = (Bean1Home)nctx.lookup( testLookup1, Bean1Home.class );
-	bean1Ref = bean1Home.create();
+	bean1Ref = (Bean1)nctx.lookup( testLookup1, Bean1.class );
 	ejb1 = bean1Ref.getCallerPrincipalName();
 	ejb2 = bean1Ref.getPropagatedPrincipalName();
-	bean1Ref.remove();
 
 	out.println( web );
 	out.println( "<BR>" );
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_ejb.xml b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_ejb.xml
index 726374262f..69dc3be146 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_ejb.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>Bean2</ejb-name>
-      <home>com.sun.ts.tests.integration.sec.propagation.Bean2Home</home>
-      <remote>com.sun.ts.tests.integration.sec.propagation.Bean2</remote>
+      <business-remote>com.sun.ts.tests.integration.sec.propagation.Bean2</business-remote>
       <ejb-class>com.sun.ts.tests.integration.sec.propagation.Bean2EJB</ejb-class>
       <session-type>Stateless</session-type>
       <transaction-type>Container</transaction-type>
@@ -49,15 +48,13 @@
     </session>
     <session>
       <ejb-name>Bean1</ejb-name>
-      <home>com.sun.ts.tests.integration.sec.propagation.Bean1Home</home>
-      <remote>com.sun.ts.tests.integration.sec.propagation.Bean1</remote>
+      <business-remote>com.sun.ts.tests.integration.sec.propagation.Bean1</business-remote>
       <ejb-class>com.sun.ts.tests.integration.sec.propagation.Bean1EJB</ejb-class>
       <session-type>Stateless</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Bean2</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.integration.sec.propagation.Bean2Home</home>
         <remote>com.sun.ts.tests.integration.sec.propagation.Bean2</remote>
       </ejb-ref>
       <security-role-ref>
@@ -94,89 +91,8 @@
     <security-role>
       <role-name>VP</role-name>
     </security-role>
-    <method-permission>
-      <role-name>Administrator</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>jakarta.ejb.Handle</method-param>
-        </method-params>
-      </method>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>java.lang.Object</method-param>
-        </method-params>
-      </method>
-    </method-permission>
-    <method-permission>
-      <role-name>Manager</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>jakarta.ejb.Handle</method-param>
-        </method-params>
-      </method>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>java.lang.Object</method-param>
-        </method-params>
-      </method>
-    </method-permission>
-    <method-permission>
-      <role-name>VP</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>jakarta.ejb.Handle</method-param>
-        </method-params>
-      </method>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>java.lang.Object</method-param>
-        </method-params>
-      </method>
-    </method-permission>
-    <method-permission>
-      <role-name>Employee</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>jakarta.ejb.Handle</method-param>
-        </method-params>
-      </method>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>remove</method-name>
-        <method-params>
-          <method-param>java.lang.Object</method-param>
-        </method-params>
-      </method>
-    </method-permission>
     <method-permission>
       <role-name>Employee</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>create</method-name>
-      </method>
       <method>
         <ejb-name>Bean2</ejb-name>
         <method-intf>Remote</method-intf>
@@ -185,11 +101,6 @@
     </method-permission>
     <method-permission>
       <role-name>Administrator</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>create</method-name>
-      </method>
       <method>
         <ejb-name>Bean2</ejb-name>
         <method-intf>Remote</method-intf>
@@ -198,11 +109,6 @@
     </method-permission>
     <method-permission>
       <role-name>Manager</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>create</method-name>
-      </method>
       <method>
         <ejb-name>Bean2</ejb-name>
         <method-intf>Remote</method-intf>
@@ -211,11 +117,6 @@
     </method-permission>
     <method-permission>
       <role-name>VP</role-name>
-      <method>
-        <ejb-name>Bean2</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>create</method-name>
-      </method>
       <method>
         <ejb-name>Bean2</ejb-name>
         <method-intf>Remote</method-intf>
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_web.xml b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_web.xml
index d24de9d376..343d6bcaa3 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_web.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/integration_sec_propagation_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -100,7 +100,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/Bean1</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.integration.sec.propagation.Bean1Home</home>
     <remote>com.sun.ts.tests.integration.sec.propagation.Bean1</remote>
   </ejb-ref>
 </web-app>
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_auth.jsp b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_auth.jsp
index b59a13c433..e278204cde 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_auth.jsp
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_auth.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2006, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,7 +38,6 @@
 
     String testLookup1 = "java:comp/env/ejb/Bean1";
 
-    Bean1Home   bean1Home = null;
     Bean1       bean1Ref  = null;
 
     String web1 = null;
@@ -52,10 +51,8 @@
     try {
         nctx = new TSNamingContext();
 
-	bean1Home = (Bean1Home)nctx.lookup( testLookup1, Bean1Home.class );
-	bean1Ref = bean1Home.create();
+	bean1Ref = (Bean1)nctx.lookup( testLookup1, Bean1.class );
 	ejb = bean1Ref.getCallerPrincipalName();
-	bean1Ref.remove();
 
 	if( request.getUserPrincipal() != null ) {
 	    web2 = request.getUserPrincipal().getName();
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_noauth.jsp b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_noauth.jsp
index 72f3f2313e..4df68bdaac 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_noauth.jsp
+++ b/integration/src/main/java/com/sun/ts/tests/integration/sec/propagation/web_to_ejb_noauth.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2006, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,7 +38,6 @@
 
     String testLookup1 = "java:comp/env/ejb/Bean1";
 
-    Bean1Home   bean1Home = null;
     Bean1       bean1Ref  = null;
 
     String web1 = null;
@@ -52,15 +51,13 @@
     try {
         nctx = new TSNamingContext();
 
-	    bean1Home = (Bean1Home)nctx.lookup( testLookup1, Bean1Home.class );
-    	bean1Ref = bean1Home.create();
+        bean1Ref = (Bean1)nctx.lookup( testLookup1, Bean1.class );
         if ( bean1Ref.getCallerPrincipalName() != null )
 	        ejb = bean1Ref.Test();
-	    bean1Ref.remove();
 
-	    if( request.getUserPrincipal() != null ) {
+        if( request.getUserPrincipal() != null ) {
 	        web2 = request.getUserPrincipal().getName();
-	    }
+        }
     } catch( Exception e ) {
         e.printStackTrace();
         out.println( e.getMessage() );
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java
index ec22ff379c..1555db93fc 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/AccessJSPBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,15 +33,13 @@ public class AccessJSPBean {
 
   private static final String ejbRef = "java:comp/env/ejb/TellerBean";
 
-  private TellerHome beanHome = null;
-
   private Teller beanRef = null;
 
   private TSNamingContext nctx = null;
 
   public AccessJSPBean() throws Exception {
     nctx = new TSNamingContext();
-    beanHome = (TellerHome) nctx.lookup(ejbRef, TellerHome.class);
+    beanRef = (Teller) nctx.lookup(ejbRef, Teller.class);
   }
 
   public void setup(Properties p) {
@@ -49,7 +47,7 @@ public void setup(Properties p) {
     try {
       if (p != null)
         TestUtil.init(p);
-      beanRef = beanHome.create(TELLERNAME, p);
+      beanRef.initialize(TELLERNAME, p);
     } catch (Exception e) {
       TestUtil.logErr("AccessJSPBean: Exception occurred - " + e, e);
     }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/Teller.java b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/Teller.java
index 62b64b0e01..fdabd1bd22 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/Teller.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/Teller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,20 +20,20 @@
 
 package com.sun.ts.tests.integration.session.jspejbjdbc;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Teller {
+  public void initialize(String name, Properties props);
 
-public interface Teller extends EJBObject {
-  public void transfer(int from, int to, double amt) throws RemoteException;
+  public void transfer(int from, int to, double amt);
 
-  public double balance(int acct) throws RemoteException;
+  public double balance(int acct);
 
-  public double withdraw(int acct, double amt) throws RemoteException;
+  public double withdraw(int acct, double amt);
 
-  public double deposit(int acct, double amt) throws RemoteException;
+  public double deposit(int acct, double amt);
 
-  public String getAllAccounts() throws RemoteException;
+  public String getAllAccounts();
 
-  public String sayHello() throws RemoteException;
+  public String sayHello();
 }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerBean.java b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerBean.java
index 42226e2839..fa533fcda2 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerBean.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,14 +26,9 @@
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.integration.util.DBSupport;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class TellerBean implements SessionBean {
-
-  private SessionContext sctx = null;
+public class TellerBean {
 
   // Database Support Access Object
   private DBSupport DB;
@@ -41,9 +36,18 @@ public class TellerBean implements SessionBean {
   // state managed variables
   public String tellerName;
 
-  public void ejbCreate(String name, Properties p) throws CreateException {
-    TestUtil.logTrace("ejbCreate");
+  public void initialize(String name, Properties p) {
+    TestUtil.logTrace("initialize");
     this.tellerName = name;
+
+    try {
+      TestUtil.logTrace("initialize database support access object");
+      DB = new DBSupport();
+    } catch (Exception e) {
+      TestUtil.printStackTrace(e);
+      throw new EJBException("Unable to initialize DB. Exception: " + e);
+    }
+
     if (p != null) {
       try {
         TestUtil.logTrace("initialize remote logging");
@@ -51,39 +55,14 @@ public void ejbCreate(String name, Properties p) throws CreateException {
         DB.initDB(true, true);
       } catch (RemoteLoggingInitException e) {
         TestUtil.printStackTrace(e);
-        throw new CreateException(e.getMessage());
+        throw new EJBException(e.getMessage());
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
-        throw new CreateException("unable to initialize DB table " + e);
+        throw new EJBException("unable to initialize DB table " + e);
       }
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-    // Initialize DB Support Access Object
-    try {
-      TestUtil.logTrace("initialize database support access object");
-      DB = new DBSupport();
-    } catch (Exception e) {
-      TestUtil.printStackTrace(e);
-      throw new EJBException("Unable to initialize DB. Exception: " + e);
-    }
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // Teller interface (our business methods)
 
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerHome.java b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerHome.java
deleted file mode 100644
index 14a5ea9548..0000000000
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/TellerHome.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.integration.session.jspejbjdbc;
-
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TellerHome extends EJBHome {
-  Teller create(String name, Properties props)
-      throws CreateException, RemoteException;
-}
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/contentRoot/jsp2ejb.jsp b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/contentRoot/jsp2ejb.jsp
index a03885e03e..0c41588375 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/contentRoot/jsp2ejb.jsp
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/contentRoot/jsp2ejb.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2006, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -43,17 +43,15 @@
     Properties transactionProps = new Properties();
     double balance;
     try {
-            TSNamingContext nctx = new TSNamingContext();
-            TellerHome  beanHome =
-		(TellerHome)nctx.lookup("java:comp/env/ejb/TellerBean",
-                                 	 TellerHome.class);
-            Teller beanRef = beanHome.create(TELLERNAME, harnessProps);
-	    balance = beanRef.balance(ACCOUNT);
-	    transactionProps.setProperty("Balance", "" + balance);
-	    balance = beanRef.deposit(ACCOUNT, 100.0);
-	    transactionProps.setProperty("Deposit", "" + balance);
-	    balance = beanRef.withdraw(ACCOUNT, 50.0);
-	    transactionProps.setProperty("Withdraw", "" + balance);
+        TSNamingContext nctx = new TSNamingContext();
+        Teller beanRef = (Teller)nctx.lookup("java:comp/env/ejb/TellerBean", Teller.class);
+        beanRef.initialize(TELLERNAME, harnessProps);
+        balance = beanRef.balance(ACCOUNT);
+        transactionProps.setProperty("Balance", "" + balance);
+        balance = beanRef.deposit(ACCOUNT, 100.0);
+        transactionProps.setProperty("Deposit", "" + balance);
+        balance = beanRef.withdraw(ACCOUNT, 50.0);
+        transactionProps.setProperty("Withdraw", "" + balance);
     } catch(Exception e) {
         e.printStackTrace();
         out.println(e.toString());
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_ejb.xml b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_ejb.xml
index 5b82bd603b..f805754da3 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_ejb.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>integration_session_jspejbjdbc_Teller</ejb-name>
-      <home>com.sun.ts.tests.integration.session.jspejbjdbc.TellerHome</home>
-      <remote>com.sun.ts.tests.integration.session.jspejbjdbc.Teller</remote>
+      <business-remote>com.sun.ts.tests.integration.session.jspejbjdbc.Teller</business-remote>
       <ejb-class>com.sun.ts.tests.integration.session.jspejbjdbc.TellerBean</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_web.xml b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_web.xml
index f6f481ccab..d90dfaa34f 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_web.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/jspejbjdbc/int_S_jspejbjdbc_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,7 +40,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/TellerBean</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.integration.session.jspejbjdbc.TellerHome</home>
     <remote>com.sun.ts.tests.integration.session.jspejbjdbc.Teller</remote>
   </ejb-ref>
 </web-app>
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java
index 99dc07916e..276678e1c5 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/ServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -44,8 +44,6 @@ public class ServletTest extends HttpServlet {
 
   private static TSNamingContext nctx = null;
 
-  private static TellerHome beanHome = null;
-
   private static Teller beanRef = null;
 
   private Properties harnessProps = null;
@@ -72,8 +70,8 @@ public void doGet(HttpServletRequest req, HttpServletResponse res)
     PrintWriter out = res.getWriter();
 
     try {
-      TestUtil.logTrace("Create bean");
-      beanRef = beanHome.create(TELLERNAME, harnessProps);
+      TestUtil.logTrace("Initialize bean");
+      beanRef.initialize(TELLERNAME, harnessProps);
       TestUtil.logTrace("List all accounts in database");
       System.out.println("List all accounts in database");
       TestUtil.logTrace("ACCOUNTS Database");
@@ -148,13 +146,13 @@ public void doPost(HttpServletRequest req, HttpServletResponse res)
     }
 
     try {
-      if (nctx == null || beanHome == null) {
+      if (nctx == null || beanRef == null) {
         TestUtil.logTrace("Obtain naming context");
         System.out.println("Obtain naming context");
         nctx = new TSNamingContext();
         TestUtil.logTrace("Lookup bean: " + ejbRef);
         System.out.println("Lookup bean: " + ejbRef);
-        beanHome = (TellerHome) nctx.lookup(ejbRef, TellerHome.class);
+        beanRef = (Teller) nctx.lookup(ejbRef, Teller.class);
       }
     } catch (Exception e) {
       TestUtil.logErr("Exception: " + e);
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/Teller.java b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/Teller.java
index 79d8ddab28..146426de57 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/Teller.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/Teller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,18 +20,18 @@
 
 package com.sun.ts.tests.integration.session.servletejbjdbc;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Teller {
+  public void initialize(String name, Properties props);
 
-public interface Teller extends EJBObject {
-  public void transfer(int from, int to, double amt) throws RemoteException;
+  public void transfer(int from, int to, double amt);
 
-  public double balance(int acct) throws RemoteException;
+  public double balance(int acct);
 
-  public double withdraw(int acct, double amt) throws RemoteException;
+  public double withdraw(int acct, double amt);
 
-  public double deposit(int acct, double amt) throws RemoteException;
+  public double deposit(int acct, double amt);
 
-  public String getAllAccounts() throws RemoteException;
+  public String getAllAccounts();
 }
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerBean.java b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerBean.java
index ead2d90377..60a561b642 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerBean.java
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,14 +26,9 @@
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.integration.util.DBSupport;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class TellerBean implements SessionBean {
-
-  private SessionContext sctx = null;
+public class TellerBean {
 
   // Database Support Access Object
   private DBSupport DB;
@@ -41,9 +36,19 @@ public class TellerBean implements SessionBean {
   // state managed variables
   public String tellerName;
 
-  public void ejbCreate(String name, Properties p) throws CreateException {
-    TestUtil.logTrace("ejbCreate");
+  public void initialize(String name, Properties p) {
+    TestUtil.logTrace("initialize");
     this.tellerName = name;
+
+    // Initialize DB Support Access Object
+    try {
+      TestUtil.logTrace("initialize database support access object");
+      DB = new DBSupport();
+    } catch (Exception e) {
+      TestUtil.printStackTrace(e);
+      throw new EJBException("Unable to initialize DB. Exception: " + e);
+    }
+
     if (p != null) {
       try {
         TestUtil.logTrace("initialize remote logging");
@@ -51,39 +56,14 @@ public void ejbCreate(String name, Properties p) throws CreateException {
         DB.initDB(true, true);
       } catch (RemoteLoggingInitException e) {
         TestUtil.printStackTrace(e);
-        throw new CreateException(e.getMessage());
+        throw new EJBException(e.getMessage());
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
-        throw new CreateException("unable to initialize DB table " + e);
+        throw new EJBException("unable to initialize DB table " + e);
       }
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-    // Initialize DB Support Access Object
-    try {
-      TestUtil.logTrace("initialize database support access object");
-      DB = new DBSupport();
-    } catch (Exception e) {
-      TestUtil.printStackTrace(e);
-      throw new EJBException("Unable to initialize DB. Exception: " + e);
-    }
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // Teller interface (our business methods)
 
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerHome.java b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerHome.java
deleted file mode 100644
index b175810191..0000000000
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/TellerHome.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.integration.session.servletejbjdbc;
-
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TellerHome extends EJBHome {
-  Teller create(String name, Properties props)
-      throws CreateException, RemoteException;
-}
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_ejb.xml b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_ejb.xml
index 0baa651e6a..4296bd7d01 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_ejb.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>integration_session_servletejbjdbc_Teller</ejb-name>
-      <home>com.sun.ts.tests.integration.session.servletejbjdbc.TellerHome</home>
-      <remote>com.sun.ts.tests.integration.session.servletejbjdbc.Teller</remote>
+      <business-remote>com.sun.ts.tests.integration.session.servletejbjdbc.Teller</business-remote>
       <ejb-class>com.sun.ts.tests.integration.session.servletejbjdbc.TellerBean</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_servlet_web.xml b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_servlet_web.xml
index a62804e120..6ef9d6fb2f 100644
--- a/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_servlet_web.xml
+++ b/integration/src/main/java/com/sun/ts/tests/integration/session/servletejbjdbc/int_S_servletejbjdbc_servlet_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/TellerBean</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.integration.session.servletejbjdbc.TellerHome</home>
     <remote>com.sun.ts.tests.integration.session.servletejbjdbc.Teller</remote>
   </ejb-ref>
 </web-app>
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/ejb/methodperm/jacc_ejb_methodperm_client.xml b/jacc/src/main/java/com/sun/ts/tests/jacc/ejb/methodperm/jacc_ejb_methodperm_client.xml
index 3af0c821ad..718b667f52 100644
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/ejb/methodperm/jacc_ejb_methodperm_client.xml
+++ b/jacc/src/main/java/com/sun/ts/tests/jacc/ejb/methodperm/jacc_ejb_methodperm_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/jacc_ejb_methodperm_MethodPermBean</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.jacc.ejb.methodperm.MethodPermBean</home>
     <remote>com.sun.ts.tests.jacc.ejb.methodperm.MethodPermInterface</remote>
   </ejb-ref>
 </application-client>
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSession.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSession.java
deleted file mode 100644
index fe34e3e03f..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSession.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$
- *
- * @author Raja Perumal
- *         08/22/02
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.EJBObject;
-
-public interface JACCSession extends EJBObject {
-
-  public String getArg1() throws RemoteException;
-
-  public int getArg2() throws RemoteException;
-
-  public long getArg3() throws RemoteException;
-
-  public String getCallerName() throws RemoteException;
-
-}
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSessionBean.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSessionBean.java
deleted file mode 100644
index d10d6b54a3..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSessionBean.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$
- *
- * @author Raja Perumal
- *         08/22/02
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import java.rmi.RemoteException;
-import java.security.Principal;
-
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class JACCSessionBean implements SessionBean {
-
-  String arg1;
-
-  int arg2;
-
-  long arg3;
-
-  private SessionContext context;
-
-  public JACCSessionBean() {
-  }
-
-  public void ejbCreate(String arg1, int arg2, long arg3)
-      throws RemoteException {
-    this.arg1 = arg1;
-    this.arg2 = arg2;
-    this.arg3 = arg3;
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    this.context = sc;
-  }
-
-  public void ejbRemove() throws RemoteException {
-  }
-
-  public void ejbActivate() throws RemoteException {
-  }
-
-  public void ejbPassivate() throws RemoteException {
-  }
-
-  public String getArg1() throws RemoteException {
-    return this.arg1;
-  }
-
-  public int getArg2() throws RemoteException {
-    return this.arg2;
-  }
-
-  public long getArg3() throws RemoteException {
-    return this.arg3;
-  }
-
-  public String getCallerName() throws RemoteException {
-    String callerName = null;
-    Principal callerPrincipal = context.getCallerPrincipal();
-
-    if (callerPrincipal != null)
-      callerName = callerPrincipal.getName();
-
-    // invoke isCallerInRole() for the following tests
-    // EJBRoleRefPermissionEquals() and
-    // EJBRoleRefPermissionHashCode()
-    boolean isCallerInRole = context.isCallerInRole("EMP");
-
-    return callerName;
-  }
-
-}
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSessionHome.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSessionHome.java
deleted file mode 100644
index 07f500d3da..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCSessionHome.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$
- *
- * @author Raja Perumal
- *         08/22/02
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface JACCSessionHome extends EJBHome {
-  JACCSession create(String arg1, int arg2, long arg3)
-      throws RemoteException, CreateException;
-}
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSession.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSession.java
deleted file mode 100644
index cc6580dcae..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSession.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$ 
- *
- * @author Raja Perumal
- *         03/13/03
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface JACCWSSession extends Remote {
-  public String hello(String str) throws RemoteException;
-}
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionBean.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionBean.java
deleted file mode 100644
index 4d6fb62368..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionBean.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$
- *
- * @author Raja Perumal
- *         03/13/03
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class JACCWSSessionBean implements SessionBean {
-
-  public void ejbCreate() {
-  }
-
-  public void ejbActivate() {
-  }
-
-  public void ejbRemove() {
-  }
-
-  public void ejbPassivate() {
-  }
-
-  public void setSessionContext(SessionContext sc) {
-  }
-
-  public String hello(String str) throws RemoteException {
-    return "Welcome to " + str;
-  }
-
-}
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionHome.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionHome.java
deleted file mode 100644
index 82bea7910c..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionHome.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$
- *
- * @author Raja Perumal
- *         03/13/03
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface JACCWSSessionHome extends EJBHome {
-  JACCWSSessionRemote create() throws RemoteException, CreateException;
-}
diff --git a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionRemote.java b/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionRemote.java
deleted file mode 100644
index 1fd252d0ad..0000000000
--- a/jacc/src/main/java/com/sun/ts/tests/jacc/util/JACCWSSessionRemote.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/**
- * $Id$
- *
- * @author Raja Perumal
- *         03/13/03
- */
-
-package com.sun.ts.tests.jacc.util;
-
-import jakarta.ejb.EJBObject;
-
-public interface JACCWSSessionRemote extends EJBObject, JACCWSSession {
-
-}
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/Client.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/Client.java
index 8f3bf8a711..8246b9986c 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/Client.java
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,8 +38,6 @@ public class Client extends ServiceEETest implements Serializable {
 
   private static final String txRef = "java:comp/env/ejb/MyEjbReference";
 
-  private TxBeanHome beanHome = null;
-
   private TxBean beanRef = null;
 
   private DBSupport db = null;
@@ -82,7 +80,7 @@ public void setup(String args[], Properties p) throws Exception {
       nctx = new TSNamingContext();
 
       TestUtil.logMsg("Lookup TxBean: " + txRef);
-      beanHome = (TxBeanHome) nctx.lookup(txRef, TxBeanHome.class);
+      beanRef = (TxBean) nctx.lookup(txRef, TxBean.class);
 
       TestUtil.logMsg("Lookup java:comp/UserTransaction");
       ut = (UserTransaction) nctx.lookup("java:comp/UserTransaction");
@@ -113,8 +111,8 @@ public void setup(String args[], Properties p) throws Exception {
       this.toKey2 = (Integer) nctx.lookup("java:comp/env/toKey2");
       TestUtil.logTrace("toKey2: " + this.toKey2);
 
-      TestUtil.logMsg("Create EJB instance of " + txRef);
-      beanRef = (TxBean) beanHome.create(p);
+      TestUtil.logMsg("Initialize " + txRef);
+      beanRef.initialize(p);
 
       TestUtil.logMsg("Setup ok");
     } catch (Exception e) {
@@ -223,7 +221,6 @@ public void test1() throws Exception {
         beanRef.destroyData(tName1);
         beanRef.dbUnConnect(tName1);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
       }
@@ -332,7 +329,6 @@ public void test2() throws Exception {
         beanRef.destroyData(tName2);
         beanRef.dbUnConnect(tName2);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
       }
@@ -428,7 +424,6 @@ public void test3() throws Exception {
         beanRef.destroyData(tName2);
         beanRef.dbUnConnect(tName2);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
         TestUtil.printStackTrace(e);
       }
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBean.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBean.java
index 55e758e6c8..538a54e4c8 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBean.java
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,27 +20,25 @@
 
 package com.sun.ts.tests.jta.ee.txpropagationtest;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface TxBean {
+  public void initialize(Properties p);
 
-public interface TxBean extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void createData(String tName) throws RemoteException;
+  public void createData(String tName);
 
-  public boolean insert(String tName, int key) throws RemoteException;
+  public boolean insert(String tName, int key);
 
-  public void delete(String tName, int fromKey, int toKey)
-      throws RemoteException;
+  public void delete(String tName, int fromKey, int toKey);
 
-  public void destroyData(String tName) throws RemoteException;
+  public void destroyData(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public Vector getResults(String tName) throws RemoteException;
+  public Vector getResults(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 }
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanEJB.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanEJB.java
index cd0d17be3b..471ebe791e 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanEJB.java
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -34,18 +34,13 @@
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class TxBeanEJB implements SessionBean {
+public class TxBeanEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
   private Properties testProps = null;
 
-  private SessionContext sctx = null;
-
   // con1 will be used for the dbTable1 connection
   // con2 will be used for the dbTable2 connection
   private transient Connection con1, con2;
@@ -72,9 +67,8 @@ public class TxBeanEJB implements SessionBean {
 
   private TSNamingContext context = null;
 
-  // Required EJB methods
-  public void ejbCreate(Properties p) throws CreateException {
-    TestUtil.logTrace("ejbCreate");
+  public void initialize(Properties p) {
+    TestUtil.logTrace("initialize");
     testProps = p;
     try {
       TestUtil.init(p);
@@ -95,27 +89,10 @@ public void ejbCreate(Properties p) throws CreateException {
 
     } catch (Exception e) {
       TestUtil.logErr("Unexpected exception getting the DB DataSource", e);
-      throw new CreateException(e.getMessage());
+      throw new EJBException(e.getMessage());
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // The TxBean interface implementation
 
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java
deleted file mode 100644
index f80db86de3..0000000000
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jta.ee.txpropagationtest;
-
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TxBeanHome extends EJBHome {
-  public TxBean create(Properties p) throws RemoteException, CreateException;
-}
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/build.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/build.xml
index 3fda744cf3..575d0ab709 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/build.xml
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,8 +27,7 @@
             value="com/sun/ts/tests/jta/ee/txpropagationtest/DBAppException.class,
                    com/sun/ts/tests/jta/ee/txpropagationtest/DBSysException.class,
                    com/sun/ts/tests/jta/ee/txpropagationtest/DBSupport.class,
-                   com/sun/ts/tests/jta/ee/txpropagationtest/TxBean.class,
-                   com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.class"/>
+                   com/sun/ts/tests/jta/ee/txpropagationtest/TxBean.class"/>
 
   <target name="package">
       <ts.ejbjar archivename="${extra.jar1}" descriptor="${extra.jar1}_ejb.xml"
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml
index ff8252c740..73341d1759 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -59,7 +59,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome</home>
     <remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</remote>
   </ejb-ref>
   <resource-ref>
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml
index 3610216612..7f185cb508 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>jta_ejb_TxRequired_TxBeanEJB1</ejb-name>
-      <home>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome</home>
-      <remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</remote>
+      <business-remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml
index 739f9ce842..d2a20546a4 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>jta_ejb_TxRequired_TxBeanEJB2</ejb-name>
-      <home>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome</home>
-      <remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</remote>
+      <business-remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
index 6ae7b69a2b..f72cd18158 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>jta_ejb_TxRequired_TxBeanEJB3</ejb-name>
-      <home>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome</home>
-      <remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</remote>
+      <business-remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml
index 8151c9c9f3..626466c5c0 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -63,7 +63,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome</home>
     <remote>com.sun.ts.tests.jta.ee.txpropagationtest.TxBean</remote>
   </ejb-ref>
   <resource-ref>
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/Hello.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/Hello.java
index 443cd0360e..09256ec285 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/Hello.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/Hello.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,12 @@
 
 package com.sun.ts.tests.samples.ejb.ee.simpleHello;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Hello {
+  public void initialize(String str, Properties p);
 
-public interface Hello extends EJBObject {
-  String sayHello() throws RemoteException;
+  String sayHello();
 
-  String sayHelloAgain() throws RemoteException;
+  String sayHelloAgain();
 }
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloClient.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloClient.java
index 481cbf15de..4a8bdb30b5 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloClient.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,8 +50,6 @@ public class HelloClient extends EETest {
   // Harness requirements
   private Hello hr = null;
 
-  private HelloHome home = null;
-
   private StringBuffer logData = null;
 
   private Properties props = null;
@@ -72,8 +70,8 @@ public void setup(String[] args, Properties p) throws Exception {
     props = p;
     try {
       jc = new TSNamingContext();
-      logMsg("Looked up home!!");
-      home = (HelloHome) jc.lookup("java:comp/env/ejb/Hello", HelloHome.class);
+      logMsg("Looked up EJB!!");
+      hr = (Hello) jc.lookup("java:comp/env/ejb/Hello", Hello.class);
       logMsg("Setup ok;");
     } catch (Exception e) {
       throw new Exception("Setup Failed!", e);
@@ -96,7 +94,7 @@ public void setup(String[] args, Properties p) throws Exception {
   @CleanupMethod(name = "helloTestCleanup")
   public void helloTest1() throws Exception {
     try {
-      hr = home.create(helloStr, props);
+      hr.initialize(helloStr, props);
       // invoke method on the EJB
       logMsg(hr.sayHello());
       logMsg("Test passed;");
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloEJB.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloEJB.java
index 44cfff02ed..f1053a74cf 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloEJB.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,26 +23,22 @@
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class HelloEJB implements SessionBean {
-  private SessionContext context;
+import java.util.Properties;
 
+public class HelloEJB {
   private String str;
 
-  private java.util.Properties p = null;
+  private Properties p = null;
 
   public HelloEJB() {
   }
 
-  public void ejbCreate(String str, java.util.Properties props)
-      throws CreateException {
+  public void initialize(String str, Properties props) {
     p = props;
     try {
-      TestUtil.logTrace("ejbCreate");
+      TestUtil.logTrace("initialize");
       TestUtil.init(props);
       this.str = str;
     } catch (Exception e) {
@@ -57,9 +53,8 @@ public String sayHello() {
     Hello hr = null;
     try {
       TSNamingContext ic = new TSNamingContext();
-      HelloHome home = (HelloHome) ic.lookup("java:comp/env/ejb/Hello",
-          HelloHome.class);
-      hr = home.create("Hello Again!!", p);
+      hr = (Hello) ic.lookup("java:comp/env/ejb/Hello", Hello.class);
+      hr.initialize("Hello Again!!", p);
       TestUtil.logMsg("Got the EJB!!");
     } catch (Exception ex) {
       TestUtil.logErr("got exception", ex);
@@ -86,19 +81,4 @@ public String sayHelloAgain() {
     return str;
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    context = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbActivate() {
-  }
-
-  public void ejbPassivate() {
-  }
-
 }
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloHome.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloHome.java
deleted file mode 100644
index 11c63a3ad5..0000000000
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/HelloHome.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.samples.ejb.ee.simpleHello;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface HelloHome extends EJBHome {
-  Hello create(String str, java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_client.xml b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_client.xml
index 773ed0a905..419c03c627 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_client.xml
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/Hello</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloHome</home>
     <remote>com.sun.ts.tests.samples.ejb.ee.simpleHello.Hello</remote>
   </ejb-ref>
 </application-client>
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_ejb.xml b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_ejb.xml
index 24e9699ce3..4fd6f7a630 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_ejb.xml
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/simpleHello/ejb_sam_Hello_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>Hello</ejb-name>
-      <home>com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloHome</home>
-      <remote>com.sun.ts.tests.samples.ejb.ee.simpleHello.Hello</remote>
+      <business-remote>com.sun.ts.tests.samples.ejb.ee.simpleHello.Hello</business-remote>
       <ejb-class>com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Hello</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.samples.ejb.ee.simpleHello.HelloHome</home>
         <remote>com.sun.ts.tests.samples.ejb.ee.simpleHello.Hello</remote>
         <ejb-link>Hello</ejb-link>
       </ejb-ref>
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1.java
index f01130f208..c3368d389c 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,12 +19,12 @@
  */
 package com.sun.ts.tests.samples.ejb.ee.twobean;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface TestBean1 {
+  public void initialize(Properties props);
 
-public interface TestBean1 extends EJBObject {
-  public boolean simpleTest1() throws RemoteException;
+  public boolean simpleTest1();
 
-  public boolean simpleTest2(int n) throws RemoteException;
+  public boolean simpleTest2(int n);
 }
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1EJB.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1EJB.java
index 5ed8ecd760..9d426d257c 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1EJB.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1EJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,19 +19,14 @@
  */
 package com.sun.ts.tests.samples.ejb.ee.twobean;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class TestBean1EJB implements SessionBean {
-  private SessionContext sctx = null;
+import jakarta.ejb.EJBException;
 
+public class TestBean1EJB {
   private Properties props = null;
 
   private Properties testProps = null;
@@ -39,42 +34,19 @@ public class TestBean1EJB implements SessionBean {
   // testBean2 JNDI name
   private static final String testBean2 = "java:comp/env/ejb/TestBean2";
 
-  private TestBean2Home home = null;
-
   private TestBean2 ref = null;
 
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
-  }
-
-  public void ejbCreate(Properties p) throws CreateException {
-    TestUtil.logTrace("ejbCreate");
+  public void initialize(Properties p) {
+    TestUtil.logTrace("initialize");
     testProps = p;
     try {
       TestUtil.init(p);
     } catch (Exception e) {
       TestUtil.logErr("init failed", e);
-      throw new CreateException("ejbcreate failed" + e.getMessage());
+      throw new EJBException("initialize failed" + e.getMessage());
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // TestBean interface (our business methods)
 
@@ -86,19 +58,15 @@ public boolean simpleTest1() {
     TestUtil.logMsg("call business method in another bean");
 
     try {
-      // lookup EJB home
+      // lookup EJB
       jc = new TSNamingContext();
-      home = (TestBean2Home) jc.lookup(testBean2, TestBean2Home.class);
-      TestUtil.logMsg("TestBean2Home=" + home);
-      // create EJB instance
-      TestUtil.logMsg("Create 2nd Bean instance");
-      ref = (TestBean2) home.create();
-      TestUtil.logTrace("TestBean2Ref=" + ref);
+      ref = (TestBean2) jc.lookup(testBean2, TestBean2.class);
+      TestUtil.logMsg("TestBean2Ref=" + ref);
       // call initLogging
       ref.initLogging(testProps);
       ref.bean2Test();
       pass = true;
-    } catch (RemoteException ex) {
+    } catch (EJBException ex) {
       TestUtil.logErr("call to Bean2 failed", ex);
       pass = false;
     } catch (Exception e) {
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1Home.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1Home.java
deleted file mode 100644
index 9f052023ff..0000000000
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean1Home.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-package com.sun.ts.tests.samples.ejb.ee.twobean;
-
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TestBean1Home extends EJBHome {
-  public TestBean1 create() throws RemoteException, CreateException;
-
-  public TestBean1 create(Properties p) throws RemoteException, CreateException;
-}
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2.java
index df20f01dc6..b36ad137c6 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,10 @@
 
 package com.sun.ts.tests.samples.ejb.ee.twobean;
 
-import java.rmi.RemoteException;
+import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface TestBean2 {
+  public void initLogging(Properties p);
 
-public interface TestBean2 extends EJBObject {
-  public void initLogging(java.util.Properties p) throws RemoteException;
-
-  public void bean2Test() throws RemoteException;
+  public void bean2Test();
 }
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2EJB.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2EJB.java
index b010246bec..65a51022c0 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2EJB.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2EJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,36 +23,9 @@
 
 import com.sun.ts.lib.util.TestUtil;
 
-import jakarta.ejb.CreateException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class TestBean2EJB implements SessionBean {
-  private SessionContext sctx = null;
-
+public class TestBean2EJB {
   private Properties props = null;
 
-  public void ejbCreate() throws CreateException {
-    TestUtil.logTrace("ejbCreate");
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // Logging method for TS
 
   public void initLogging(Properties p) {
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2Home.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2Home.java
deleted file mode 100644
index cfc8c9a43a..0000000000
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TestBean2Home.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.samples.ejb.ee.twobean;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TestBean2Home extends EJBHome {
-  public TestBean2 create() throws RemoteException, CreateException;
-}
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TwoBeanClient.java b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TwoBeanClient.java
index d37ed8bbe9..a0a8e75804 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TwoBeanClient.java
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/TwoBeanClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,8 +50,6 @@ public class TwoBeanClient extends EETest {
 
   private TestBean1 ref = null;
 
-  private TestBean1Home home = null;
-
   private StringBuffer logData = null;
 
   /* Run test in standalone mode */
@@ -72,8 +70,9 @@ public void setup(String[] args, Properties p) throws Exception {
     this.props = p;
     try {
       jc = new TSNamingContext();
-      logMsg("Looked up home!!");
-      home = (TestBean1Home) jc.lookup(testBean1, TestBean1Home.class);
+      logMsg("Looked up EJB!!");
+      ref = (TestBean1) jc.lookup(testBean1, TestBean1.class);
+      ref.initialize(props);
       logMsg("Setup ok;");
     } catch (Exception e) {
       throw new Exception("Setup Failed!", e);
@@ -97,7 +96,6 @@ public void setup(String[] args, Properties p) throws Exception {
   public void twobeanTest1() throws Exception {
     boolean result = false;
     try {
-      ref = home.create(props);
       // invoke method on the EJB
       result = ref.simpleTest1();
       // logData = ref.getServerLogData();
@@ -125,7 +123,6 @@ public void twobeanTest1() throws Exception {
   public void twobeanTest2() throws Exception {
     boolean result = false;
     try {
-      ref = home.create(props);
       // invoke method on the EJB
       result = ref.simpleTest2(100);
       // logData = ref.getServerLogData();
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_client.xml b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_client.xml
index 373c3843a6..24fd51d721 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_client.xml
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/TestBean1</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean1Home</home>
     <remote>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean1</remote>
   </ejb-ref>
 </application-client>
diff --git a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_ejb.xml b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_ejb.xml
index e7eb4ed6e7..62291fd579 100644
--- a/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_ejb.xml
+++ b/samples/src/main/java/com/sun/ts/tests/samples/ejb/ee/twobean/ejb_sam_twobean_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_cts_tests_samples_ejb_ee_twobean_TestBean1</ejb-name>
-      <home>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean1Home</home>
-      <remote>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean1</remote>
+      <business-remote>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean1</business-remote>
       <ejb-class>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean1EJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/TestBean2</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean2Home</home>
         <remote>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean2</remote>
       </ejb-ref>
       <security-identity>
@@ -39,8 +37,7 @@
     </session>
     <session>
       <ejb-name>com_sun_cts_tests_samples_ejb_ee_twobean_TestBean2</ejb-name>
-      <home>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean2Home</home>
-      <remote>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean2</remote>
+      <business-remote>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean2</business-remote>
       <ejb-class>com.sun.ts.tests.samples.ejb.ee.twobean.TestBean2EJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeBean.java b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeBean.java
index 6f75a425e4..b9248e886a 100644
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeBean.java
+++ b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,25 +16,7 @@
 
 package com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest;
 
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class ChokeBean implements SessionBean {
-  public void ejbCreate() {
-  }
-
-  public void ejbActivate() {
-  }
-
-  public void ejbRemove() {
-  }
-
-  public void ejbPassivate() {
-  }
-
-  public void setSessionContext(SessionContext sc) {
-  }
-
+public class ChokeBean {
   public void chokeMandatory() {
   }
 
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeHome.java b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeHome.java
deleted file mode 100644
index 76c8a730ba..0000000000
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeHome.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest;
-
-import java.rmi.RemoteException;
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface ChokeHome extends EJBHome {
-  ChokeRemote create() throws RemoteException, CreateException;
-}
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeRemote.java b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeRemote.java
index 2c427e066a..89ce050a12 100644
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeRemote.java
+++ b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/ChokeRemote.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,11 +16,8 @@
 
 package com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest;
 
-import jakarta.ejb.EJBObject;
-import java.rmi.RemoteException;
+public interface ChokeRemote {
+  public void chokeMandatory();
 
-public interface ChokeRemote extends EJBObject {
-  public void chokeMandatory() throws RemoteException;
-
-  public void chokeNever() throws RemoteException;
+  public void chokeNever();
 }
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxBean.java b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxBean.java
index c37760929f..f614a1c495 100644
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxBean.java
+++ b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,58 +16,34 @@
 
 package com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest;
 
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 
+import javax.naming.InitialContext;
+
 @WebService(portName = "JunkJunkJunkPortName", serviceName = "JunkJunkJunkServiceName", targetNamespace = "http://Tx.org", wsdlLocation = "META-INF/wsdl/TxService.wsdl", endpointInterface = "com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.Tx")
 @Stateless(name = "WsFrontEjb")
-public class TxBean implements SessionBean {
-
-  private ChokeRemote choke;
+public class TxBean {
 
-  private ChokeHome home;
+  private ChokeRemote choke = null;
 
   private Object o;
 
-  public void ejbCreate() {
-    try {
-      javax.naming.InitialContext ctx = new javax.naming.InitialContext();
-      o = ctx.lookup("java:comp/env/ejb/wschokebean");
-      home = (ChokeHome) javax.rmi.PortableRemoteObject.narrow(o,
-          ChokeHome.class);
-      choke = home.create();
-    } catch (Exception e) {
-      System.out.println("*** TxBean.ejbCreate: failed to find choke");
-      e.printStackTrace();
-    }
-  }
-
-  public void ejbActivate() {
+  private void lookupChoke() {
     try {
-      javax.naming.InitialContext ctx = new javax.naming.InitialContext();
-      o = ctx.lookup("java:comp/env/ejb/wschokebean");
-      home = (ChokeHome) javax.rmi.PortableRemoteObject.narrow(o,
-          ChokeHome.class);
-      choke = home.create();
+      if (choke == null) {
+        InitialContext ctx = new InitialContext();
+        choke = (ChokeRemote) ctx.lookup("java:comp/env/ejb/wschokebean");
+      }
     } catch (Exception e) {
-      System.out.println("*** TxBean.ejbActivate: failed to find choke");
+      System.out.println("*** TxBean.lookupChoke: failed to find choke");
       e.printStackTrace();
     }
   }
 
-  public void ejbRemove() {
-  }
-
-  public void ejbPassivate() {
-  }
-
-  public void setSessionContext(SessionContext sc) {
-  }
-
   public String txRequired(String s) {
     try {
+      lookupChoke();
       choke.chokeMandatory();
       return s;
     } catch (Exception e) {
@@ -78,6 +54,7 @@ public String txRequired(String s) {
 
   public String txRequiresNew(String s) {
     try {
+      lookupChoke();
       choke.chokeMandatory();
       return s;
     } catch (Exception e) {
@@ -88,6 +65,7 @@ public String txRequiresNew(String s) {
 
   public String txSupports(String s) {
     try {
+      lookupChoke();
       choke.chokeNever();
       return s;
     } catch (Exception e) {
@@ -98,6 +76,7 @@ public String txSupports(String s) {
 
   public String txNotSupported(String s) {
     try {
+      lookupChoke();
       choke.chokeNever();
       return s;
     } catch (Exception e) {
@@ -108,6 +87,7 @@ public String txNotSupported(String s) {
 
   public String txNever(String s) {
     try {
+      lookupChoke();
       choke.chokeNever();
       return s;
     } catch (Exception e) {
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxHome.java b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxHome.java
deleted file mode 100644
index 7ea7c2c6af..0000000000
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxHome.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest;
-
-import java.rmi.RemoteException;
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TxHome extends EJBHome {
-  TxRemote create() throws RemoteException, CreateException;
-}
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxRemote.java b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxRemote.java
index 5187cba277..f187379bc5 100644
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxRemote.java
+++ b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/TxRemote.java
@@ -16,17 +16,14 @@
 
 package com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest;
 
-import jakarta.ejb.EJBObject;
-import java.rmi.RemoteException;
+public interface TxRemote {
+  public String txRequired(String str);
 
-public interface TxRemote extends EJBObject {
-  public String txRequired(String str) throws RemoteException;
+  public String txRequiresNew(String str);
 
-  public String txRequiresNew(String str) throws RemoteException;
+  public String txSupports(String str);
 
-  public String txSupports(String str) throws RemoteException;
+  public String txNotSupported(String str);
 
-  public String txNotSupported(String str) throws RemoteException;
-
-  public String txNever(String str) throws RemoteException;
+  public String txNever(String str);
 }
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/WSEjbOverrideWSRefWithDDsTest_ejb.xml b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/WSEjbOverrideWSRefWithDDsTest_ejb.xml
index 0ea5d6557e..d193b63162 100644
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/WSEjbOverrideWSRefWithDDsTest_ejb.xml
+++ b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/WSEjbOverrideWSRefWithDDsTest_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,15 +24,13 @@
     <session>
       <display-name>WsFrontEjb</display-name>
       <ejb-name>WsFrontEjb</ejb-name>
-      <home>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.TxHome</home>
-      <remote>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.TxRemote</remote>
+      <business-remote>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.TxRemote</business-remote>
       <ejb-class>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.TxBean</ejb-class>
       <session-type>Stateless</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/wschokebean</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.ChokeHome</home>
         <remote>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.ChokeRemote</remote>
         <ejb-link>WsChokeEjb</ejb-link>
       </ejb-ref>
@@ -45,8 +43,7 @@
     <session>
       <display-name>WsChokeEjb</display-name>
       <ejb-name>WsChokeEjb</ejb-name>
-      <home>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.ChokeHome</home>
-      <remote>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.ChokeRemote</remote>
+      <business-remote>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.ChokeRemote</business-remote>
       <ejb-class>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.ChokeBean</ejb-class>
       <session-type>Stateless</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/build.xml b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/build.xml
index 3d13721ea5..cb22f80526 100644
--- a/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/build.xml
+++ b/webservices12/src/main/java/com/sun/ts/tests/webservices12/ejb/descriptors/WSEjbOverrideWSRefWithDDsTest/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,10 +38,8 @@
 	<zipfileset dir="${src.dir}/${pkg.dir}" includes="webservices.xml"  prefix="META-INF" />
 	<zipfileset dir="${class.dir}" includes="
 	    ${pkg.dir}/Tx.class,
-	    ${pkg.dir}/TxHome.class,
 	    ${pkg.dir}/TxRemote.class,
 	    ${pkg.dir}/TxBean.class,
-	    ${pkg.dir}/ChokeHome.class,
 	    ${pkg.dir}/ChokeRemote.class,
 	    ${pkg.dir}/ChokeBean.class,
             com/sun/ts/tests/jaxws/common/JAXWS_Util.class,
@@ -56,7 +54,7 @@
       <delete file="application.xml" />
 
       <copy file="application.xml.clientear" tofile="application.xml"/>
-      <ts.clientjar archivename="${client.app.name}" descriptor="${client.app.name}_client.xml" mainclass="com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.Client" excludedfiles="${pkg.dir}/TxBean.class, ${pkg.dir}/TxHome.class, ${pkg.dir}/TxRemote.class, ${pkg.dir}/Choke*.class">
+      <ts.clientjar archivename="${client.app.name}" descriptor="${client.app.name}_client.xml" mainclass="com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefWithDDsTest.Client" excludedfiles="${pkg.dir}/TxBean.class, ${pkg.dir}/TxRemote.class, ${pkg.dir}/Choke*.class">
 	<zipfileset dir="${src.dir}/${pkg.dir}" includes="${wsdl.filename}"  prefix="META-INF/wsdl" />
 	<zipfileset dir="${class.dir}" includes="
 	    ${pkg.dir}/Tx.class,
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/Client.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/Client.java
index 4b8a1133f5..14d93b4ac7 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/Client.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -42,8 +42,6 @@ public class Client extends ServiceEETest implements Serializable {
 
   private static final String txRef = "java:comp/env/ejb/MyEjbReference";
 
-  private TxBeanHome beanHome = null;
-
   private TxBean beanRef = null;
 
   private UserTransaction ut = null;
@@ -81,7 +79,7 @@ public void setup(String args[], Properties p) throws Exception {
       nctx = new TSNamingContext();
 
       TestUtil.logMsg("Lookup TxBean: " + txRef);
-      beanHome = (TxBeanHome) nctx.lookup(txRef, TxBeanHome.class);
+      beanRef = (TxBean) nctx.lookup(txRef, TxBean.class);
 
       TestUtil.logMsg("Lookup java:comp/UserTransaction");
       ut = (UserTransaction) nctx.lookup("java:comp/UserTransaction");
@@ -105,8 +103,8 @@ public void setup(String args[], Properties p) throws Exception {
       this.toKey2 = (Integer) nctx.lookup("java:comp/env/toKey2");
       TestUtil.logTrace("toKey2: " + this.toKey2);
 
-      TestUtil.logMsg("Create EJB instance of " + txRef);
-      beanRef = (TxBean) beanHome.create();
+      TestUtil.logMsg("Initialize " + txRef);
+      beanRef.initialize();
 
       TestUtil.logMsg("Initialize logging data from server");
       beanRef.initLogging(p);
@@ -215,7 +213,6 @@ public void test1() throws Exception {
         beanRef.destroyData(tName1);
         beanRef.dbUnConnect(tName1);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -321,7 +318,6 @@ public void test2() throws Exception {
         beanRef.destroyData(tName1);
         beanRef.dbUnConnect(tName1);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -419,7 +415,6 @@ public void test3() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.dbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -525,7 +520,6 @@ public void test4() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.dbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBean.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBean.java
index a48d04a46a..07f7bc227d 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBean.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,31 +24,29 @@
 
 package com.sun.ts.tests.xa.ee.resXcomp1;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface TxBean {
+  public void initialize();
 
-public interface TxBean extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void createData(String tName) throws RemoteException;
+  public void createData(String tName);
 
-  public boolean insert(String tName, int key) throws RemoteException;
+  public boolean insert(String tName, int key);
 
-  public void delete(String tName, int fromKey, int toKey)
-      throws RemoteException;
+  public void delete(String tName, int fromKey, int toKey);
 
-  public void destroyData(String tName) throws RemoteException;
+  public void destroyData(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public Vector getResults(String tName) throws RemoteException;
+  public Vector getResults(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 
-  public void listTableData(Vector dbResults) throws RemoteException;
+  public void listTableData(Vector dbResults);
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanEJB.java
index 6d54ccab21..5cc71f0f29 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,18 +40,13 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class TxBeanEJB implements SessionBean {
+public class TxBeanEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
   private Properties testProps = null;
 
-  private SessionContext sctx = null;
-
   // con1 will be used for the dbTable1 connection
   private transient Connection con1;
 
@@ -76,10 +71,9 @@ public class TxBeanEJB implements SessionBean {
 
   private transient TSConnection con2;
 
-  // Required EJB methods
-  public void ejbCreate() throws CreateException {
+  public void initialize() {
     String eMsg = "";
-    TestUtil.logTrace("ejbCreate");
+    TestUtil.logTrace("initialize");
     try {
 
       context = new TSNamingContext();
@@ -95,31 +89,10 @@ public void ejbCreate() throws CreateException {
     } catch (Exception e) {
       TestUtil.logTrace(eMsg);
       TestUtil.logErr("Unexpected exception getting the DB DataSource", e);
-      throw new CreateException(e.getMessage());
+      throw new EJBException(e.getMessage());
     }
   }
 
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("setSessionContext");
-    this.sctx = sc;
-  }
-
-  public void ejbRemove() {
-    TestUtil.logTrace("ejbRemove");
-  }
-
-  public void ejbDestroy() {
-    TestUtil.logTrace("ejbDestroy");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("ejbPassivate");
-  }
-
   // ===========================================================
   // The TxBean interface implementation
 
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanHome.java
deleted file mode 100644
index ec2e58596d..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/TxBeanHome.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)TxBeanHome.java  1.0 02/07/31
- */
-
-package com.sun.ts.tests.xa.ee.resXcomp1;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface TxBeanHome extends EJBHome {
-  public TxBean create() throws RemoteException, CreateException;
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/ejb_vehicle_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/ejb_vehicle_ejb.xml
index 4c5e769dc2..25367dc15b 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/ejb_vehicle_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/ejb_vehicle_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_ts_tests_common_vehicle_ejb_EJBVehicle</ejb-name>
-      <home>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome</home>
-      <remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</remote>
+      <business-remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</business-remote>
       <ejb-class>com.sun.ts.tests.common.vehicle.ejb.EJBVehicle</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Bean</transaction-type>
@@ -50,7 +49,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/jsp_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/jsp_vehicle_web.xml
index 7272267c4b..a2e3d71ddf 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/jsp_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/jsp_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -61,7 +61,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/servlet_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/servlet_vehicle_web.xml
index 9347551467..5d955ce210 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/servlet_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/servlet_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -65,7 +65,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/txbean_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/txbean_ejb.xml
index ebe7394e31..21e905064c 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/txbean_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/txbean_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_TxBeanEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate1_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate1_ejb.xml
index 9bb15f522e..e8aaf9312a 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate1_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate1_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp1_ejb_TxRequired_TxBeanEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate2_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate2_ejb.xml
index e591bc2fad..0de333ae40 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate2_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp1_ejb_TxRequired_TxBeanEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate3_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate3_ejb.xml
index dd7772416e..036d6ad69c 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate3_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp1/xa_resXcomp1_ee_txpropagate3_ejb.xml
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp1_ejb_TxRequired_TxBeanEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp1.TxBean</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp1.TxBeanEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Client.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Client.java
index 2706e55ddc..5cea18d72d 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Client.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,8 +40,6 @@ public class Client extends ServiceEETest implements Serializable {
 
   private static final String txRef = "java:comp/env/ejb/MyEjbReference";
 
-  private Ejb1TestHome beanHome = null;
-
   private Ejb1Test beanRef = null;
 
   private UserTransaction ut = null;
@@ -75,7 +73,7 @@ public void setup(String args[], Properties p) throws Exception {
       nctx = new TSNamingContext();
 
       TestUtil.logMsg("Lookup Ejb1Test: " + txRef);
-      beanHome = (Ejb1TestHome) nctx.lookup(txRef, Ejb1TestHome.class);
+      beanRef = (Ejb1Test) nctx.lookup(txRef, Ejb1Test.class);
 
       TestUtil.logMsg("Lookup java:comp/UserTransaction");
       ut = (UserTransaction) nctx.lookup("java:comp/UserTransaction");
@@ -86,8 +84,8 @@ public void setup(String args[], Properties p) throws Exception {
           .getTableName(TestUtil.getProperty("Xa_Tab1_Delete"));
       TestUtil.logTrace("tName1: " + this.tName1);
 
-      TestUtil.logMsg("Create EJB instance of " + txRef);
-      beanRef = (Ejb1Test) beanHome.create(testProps);
+      TestUtil.logMsg("Initialize " + txRef);
+      beanRef.initialize(testProps);
 
       TestUtil.logMsg("Initialize logging data from server in Client");
       beanRef.initLogging(p);
@@ -175,7 +173,6 @@ public void test5() throws Exception {
         beanRef.destroyData(tName1);
         beanRef.dbUnConnect(tName1);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -253,7 +250,6 @@ public void test6() throws Exception {
         beanRef.destroyData(tName1);
         beanRef.dbUnConnect(tName1);
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -329,7 +325,6 @@ public void test7() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.dbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -405,7 +400,6 @@ public void test8() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.dbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1Test.java
index daa87a4c0d..b5afd94220 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,24 +24,22 @@
 
 package com.sun.ts.tests.xa.ee.resXcomp2;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb1Test {
+  public void initialize(Properties p);
 
-public interface Ejb1Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void insert(String tName) throws RemoteException;
+  public void insert(String tName);
 
-  public void destroyData(String tName) throws RemoteException;
+  public void destroyData(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 
-  public boolean verifyData(String operation, String tName, int[] expResults)
-      throws RemoteException;
+  public boolean verifyData(String operation, String tName, int[] expResults);
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestEJB.java
index 8e59047892..bdac34e702 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +23,7 @@
  */
 package com.sun.ts.tests.xa.ee.resXcomp2;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -38,24 +39,17 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb1TestEJB implements SessionBean {
+public class Ejb1TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private java.util.Properties p = null;
-
-  private SessionContext sctx = null;
+  private Properties p = null;
 
   private Properties testProps = null;
 
   private Ejb2Test ref = null;
 
-  private Ejb2TestHome home = null;
-
   private TSNamingContext context = null;
 
   // DataSources
@@ -65,7 +59,7 @@ public class Ejb1TestEJB implements SessionBean {
 
   private String dbTable1 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
   private transient Statement stmt;
 
@@ -77,7 +71,7 @@ public class Ejb1TestEJB implements SessionBean {
   public Ejb1TestEJB() {
   }
 
-  public void ejbCreate(java.util.Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
@@ -86,9 +80,8 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
 
       // get reference to ejb
       eMsg = "Exception doing a lookup for Ejb2Test ";
-      home = (Ejb2TestHome) context.lookup("java:comp/env/ejb/Ejb2Test",
-          Ejb2TestHome.class);
-      ref = home.create(props);
+      ref = (Ejb2Test) context.lookup("java:comp/env/ejb/Ejb2Test", Ejb2Test.class);
+      ref.initialize(props);
 
       TestUtil.logMsg("Initialize logging data from server in Ejb1");
       eMsg = "Exception doing a initLogging for Ejb2Test ";
@@ -106,33 +99,10 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
     } catch (Exception e) {
       TestUtil.logTrace(eMsg);
       TestUtil.logErr("Ejb1: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    try {
-      TestUtil.logTrace("Ejb1 @setSessionContext");
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logTrace("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestHome.java
deleted file mode 100644
index 02eeb42107..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb1TestHome.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb1TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.resXcomp2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb1TestHome extends EJBHome {
-  Ejb1Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2Test.java
index fc8be4d29a..fd2ab9796b 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,21 +24,19 @@
 
 package com.sun.ts.tests.xa.ee.resXcomp2;
 
-import java.rmi.RemoteException;
-//import jakarta.jms.*;
 import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb2Test {
+  public void initialize(Properties p);
 
-public interface Ejb2Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void insert(String tName) throws RemoteException;
+  public void insert(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestEJB.java
index 080b2e17f9..9db12d89f2 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,29 +23,23 @@
  */
 package com.sun.ts.tests.xa.ee.resXcomp2;
 
+import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
 import javax.sql.DataSource;
 
-//import jakarta.jms.*;
-//import java.rmi.*; 
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb2TestEJB implements SessionBean {
+public class Ejb2TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   private Properties testProps = null;
@@ -57,7 +51,7 @@ public class Ejb2TestEJB implements SessionBean {
 
   private String dbTable1 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
   private transient Statement stmt;
 
@@ -69,7 +63,7 @@ public class Ejb2TestEJB implements SessionBean {
   public Ejb2TestEJB() {
   }
 
-  public void ejbCreate(Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
@@ -89,34 +83,11 @@ public void ejbCreate(Properties props) throws CreateException {
 
     } catch (Exception e) {
       TestUtil.logTrace(eMsg);
-      TestUtil.logErr("EJB2: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("EJB2 @setSessionContext");
-    try {
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("EJB2: initialize failed", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logTrace("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestHome.java
deleted file mode 100644
index b171ea0b5e..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/Ejb2TestHome.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb2TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.resXcomp2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb2TestHome extends EJBHome {
-  Ejb2Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb1test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb1test_ejb.xml
index 859146d42f..042290108b 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb1test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb1test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb1TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb2test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb2test_ejb.xml
index 3f3ab0fe31..98d0ee08eb 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb2test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb2test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb2TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb_vehicle_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb_vehicle_ejb.xml
index af32e3c8aa..b00732286f 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb_vehicle_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/ejb_vehicle_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,21 +22,18 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_ts_tests_common_vehicle_ejb_EJBVehicle</ejb-name>
-      <home>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome</home>
-      <remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</remote>
+      <business-remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</business-remote>
       <ejb-class>com.sun.ts.tests.common.vehicle.ejb.EJBVehicle</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Bean</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
       </ejb-ref>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/jsp_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/jsp_vehicle_web.xml
index 681c37ce22..1edda5f9c1 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/jsp_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/jsp_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -41,13 +41,11 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
   </ejb-ref>
   <ejb-ref>
     <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/servlet_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/servlet_vehicle_web.xml
index 5dcfb090c5..26d7a2491e 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/servlet_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/servlet_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -45,13 +45,11 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
   </ejb-ref>
   <ejb-ref>
     <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate1_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate1_ejb.xml
index d1c1e14134..f26fb50da0 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate1_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate1_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp2_ejb_TxRequired_Ejb2TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -47,15 +46,13 @@
     </session>
     <session>
       <ejb-name>xa_resXcomp2_ejb_TxRequired_Ejb1TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate2_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate2_ejb.xml
index 066a993a1a..c4b925af89 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate2_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp2_ejb_TxRequired_Ejb2TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -47,15 +46,13 @@
     </session>
     <session>
       <ejb-name>xa_resXcomp2_ejb_TxRequired_Ejb1TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate3_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate3_ejb.xml
index f78e13fd87..9fbf26692f 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate3_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp2/xa_resXcomp2_ee_txpropagate3_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp2_ejb_TxRequired_Ejb2TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -47,15 +46,13 @@
     </session>
     <session>
       <ejb-name>xa_resXcomp2_ejb_TxRequired_Ejb1TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Client.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Client.java
index a74bae08a6..f8672b1c54 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Client.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,8 +40,6 @@ public class Client extends ServiceEETest implements Serializable {
 
   private static final String txRef = "java:comp/env/ejb/MyEjbReference";
 
-  private Ejb1TestHome beanHome = null;
-
   private Ejb1Test beanRef = null;
 
   private UserTransaction ut = null;
@@ -75,7 +73,7 @@ public void setup(String args[], Properties p) throws Exception {
       nctx = new TSNamingContext();
 
       TestUtil.logMsg("Lookup Ejb1Test: " + txRef);
-      beanHome = (Ejb1TestHome) nctx.lookup(txRef, Ejb1TestHome.class);
+      beanRef = (Ejb1Test) nctx.lookup(txRef, Ejb1Test.class);
 
       TestUtil.logMsg("Lookup java:comp/UserTransaction");
       ut = (UserTransaction) nctx.lookup("java:comp/UserTransaction");
@@ -86,8 +84,8 @@ public void setup(String args[], Properties p) throws Exception {
           .getTableName(TestUtil.getProperty("Xa_Tab1_Delete"));
       TestUtil.logTrace("tName1: " + this.tName1);
 
-      TestUtil.logMsg("Create EJB instance of " + txRef);
-      beanRef = (Ejb1Test) beanHome.create(testProps);
+      TestUtil.logMsg("Initialize " + txRef);
+      beanRef.initialize(testProps);
 
       TestUtil.logMsg("Initialize logging data from server in Client");
       beanRef.initLogging(p);
@@ -167,7 +165,6 @@ public void test9() throws Exception {
       // cleanup the bean
       try {
         beanRef.destroyData(tName1);
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -237,7 +234,6 @@ public void test10() throws Exception {
       // cleanup the bean
       try {
         beanRef.destroyData(tName1);
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -301,7 +297,6 @@ public void test11() throws Exception {
       // cleanup the bean
       try {
         beanRef.destroyData("EIS");
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -365,7 +360,6 @@ public void test12() throws Exception {
       // cleanup the bean
       try {
         beanRef.destroyData("EIS");
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -435,7 +429,6 @@ public void test13() throws Exception {
       // cleanup the bean
       try {
         beanRef.destroyData("EIS");
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1Test.java
index 0ce4f8008f..730dc0ae20 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,26 +24,24 @@
 
 package com.sun.ts.tests.xa.ee.resXcomp3;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb1Test {
+  public void initialize(Properties p);
 
-public interface Ejb1Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void insert(String tName) throws RemoteException;
+  public void insert(String tName);
 
-  public void insertDup(String tName) throws RemoteException;
+  public void insertDup(String tName);
 
-  public void destroyData(String tName) throws RemoteException;
+  public void destroyData(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 
-  public boolean verifyData(String operation, String tName, int[] expResults)
-      throws RemoteException;
+  public boolean verifyData(String operation, String tName, int[] expResults);
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestEJB.java
index f6da3e8b8a..c9da7b1c53 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +23,7 @@
  */
 package com.sun.ts.tests.xa.ee.resXcomp3;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -38,24 +39,17 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb1TestEJB implements SessionBean {
+public class Ejb1TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private java.util.Properties p = null;
-
-  private SessionContext sctx = null;
+  private Properties p = null;
 
   private Properties testProps = null;
 
   private Ejb2Test ref = null;
 
-  private Ejb2TestHome home = null;
-
   private TSNamingContext context = null;
 
   // DataSources
@@ -65,9 +59,9 @@ public class Ejb1TestEJB implements SessionBean {
 
   private String dbTable1 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
-  private transient java.sql.Connection con4 = null;
+  private transient Connection con4 = null;
 
   // TSEIS
   private TSEISDataSource ds2, ds3;
@@ -81,7 +75,7 @@ public class Ejb1TestEJB implements SessionBean {
   public Ejb1TestEJB() {
   }
 
-  public void ejbCreate(java.util.Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
@@ -90,9 +84,8 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
 
       // get reference to ejb
       eMsg = "Exception doing a lookup for Ejb2Test ";
-      home = (Ejb2TestHome) context.lookup("java:comp/env/ejb/Ejb2Test",
-          Ejb2TestHome.class);
-      ref = home.create(props);
+      ref = (Ejb2Test) context.lookup("java:comp/env/ejb/Ejb2Test", Ejb2Test.class);
+      ref.initialize(props);
 
       TestUtil.logMsg("Initialize logging data from server in Ejb1");
       eMsg = "Exception doing a initLogging for Ejb2Test ";
@@ -117,34 +110,11 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
 
     } catch (Exception e) {
       TestUtil.logMsg(eMsg);
-      TestUtil.logErr("Ejb1: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    try {
-      TestUtil.logTrace("Ejb1 @setSessionContext");
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("Ejb1: initialize failed", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logMsg("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestHome.java
deleted file mode 100644
index fa58fa1e5d..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb1TestHome.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb1TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.resXcomp3;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb1TestHome extends EJBHome {
-  Ejb1Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2Test.java
index b77294a96d..900df8b78d 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,20 +24,19 @@
 
 package com.sun.ts.tests.xa.ee.resXcomp3;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb2Test {
+  public void initialize(Properties p);
 
-public interface Ejb2Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void insert(String tName) throws RemoteException;
+  public void insert(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestEJB.java
index 9bda786ba8..086bf13470 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +23,7 @@
  */
 package com.sun.ts.tests.xa.ee.resXcomp3;
 
+import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
@@ -34,16 +35,11 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb2TestEJB implements SessionBean {
+public class Ejb2TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   private Properties testProps = null;
@@ -55,7 +51,7 @@ public class Ejb2TestEJB implements SessionBean {
 
   private String dbTable1 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
   private transient Statement stmt;
 
@@ -67,7 +63,7 @@ public class Ejb2TestEJB implements SessionBean {
   public Ejb2TestEJB() {
   }
 
-  public void ejbCreate(Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
@@ -87,34 +83,11 @@ public void ejbCreate(Properties props) throws CreateException {
 
     } catch (Exception e) {
       TestUtil.logTrace(eMsg);
-      TestUtil.logErr("EJB2: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("EJB2 @setSessionContext");
-    try {
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("EJB2: initialize failed", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logTrace("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestHome.java
deleted file mode 100644
index 1e3f8bbb96..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/Ejb2TestHome.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb2TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.resXcomp3;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb2TestHome extends EJBHome {
-  Ejb2Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb1test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb1test_ejb.xml
index 37f45f3368..605582b4ba 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb1test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb1test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb1TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb2test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb2test_ejb.xml
index 8fc6ec5052..6a4f8cb965 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb2test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb2test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb2TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb_vehicle_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb_vehicle_ejb.xml
index 9d0c9d5044..dbeff36a0b 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb_vehicle_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/ejb_vehicle_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,21 +22,18 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_ts_tests_common_vehicle_ejb_EJBVehicle</ejb-name>
-      <home>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome</home>
-      <remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</remote>
+      <business-remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</business-remote>
       <ejb-class>com.sun.ts.tests.common.vehicle.ejb.EJBVehicle</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Bean</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
       </ejb-ref>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/jsp_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/jsp_vehicle_web.xml
index d5475b91bf..26574645c0 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/jsp_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/jsp_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -53,13 +53,11 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
   </ejb-ref>
   <ejb-ref>
     <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/servlet_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/servlet_vehicle_web.xml
index 6d100e864d..18301aa4cc 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/servlet_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/servlet_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,13 +57,11 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
   </ejb-ref>
   <ejb-ref>
     <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate1_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate1_ejb.xml
index b45c8bf3b3..313ac49040 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate1_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate1_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp3_ejb_TxRequired_Ejb1TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
@@ -67,8 +65,7 @@
     </session>
     <session>
       <ejb-name>xa_resXcomp3_ejb_TxRequired_Ejb2TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate2_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate2_ejb.xml
index 381180f049..5d59b372b1 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate2_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp3_ejb_TxRequired_Ejb1TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
@@ -67,8 +65,7 @@
     </session>
     <session>
       <ejb-name>xa_resXcomp3_ejb_TxRequired_Ejb2TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate3_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate3_ejb.xml
index 19b5338106..834318a2dd 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate3_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/resXcomp3/xa_resXcomp3_ee_txpropagate3_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,13 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_resXcomp3_ejb_TxRequired_Ejb1TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
@@ -67,8 +65,7 @@
     </session>
     <session>
       <ejb-name>xa_resXcomp3_ejb_TxRequired_Ejb2TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.resXcomp3.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Client.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Client.java
index 2369e1de56..1bd92c07e4 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Client.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -41,8 +41,6 @@ public class Client extends ServiceEETest implements Serializable {
 
   private static final String txRef = "java:comp/env/ejb/MyEjbReference";
 
-  private Ejb1TestHome beanHome = null;
-
   private Ejb1Test beanRef = null;
 
   private UserTransaction ut = null;
@@ -85,7 +83,7 @@ public void setup(String args[], Properties p) throws Exception {
       nctx = new TSNamingContext();
 
       TestUtil.logMsg("Lookup Ejb1Test: " + txRef);
-      beanHome = (Ejb1TestHome) nctx.lookup(txRef, Ejb1TestHome.class);
+      beanRef = (Ejb1Test) nctx.lookup(txRef, Ejb1Test.class);
 
       TestUtil.logMsg("Lookup java:comp/UserTransaction");
       ut = (UserTransaction) nctx.lookup("java:comp/UserTransaction");
@@ -109,8 +107,8 @@ public void setup(String args[], Properties p) throws Exception {
       this.toKey2 = (Integer) nctx.lookup("java:comp/env/toKey2");
       TestUtil.logTrace("toKey2: " + this.toKey2);
 
-      TestUtil.logMsg("Create EJB instance of " + txRef);
-      beanRef = (Ejb1Test) beanHome.create(testProps);
+      TestUtil.logMsg("Initialize " + txRef);
+      beanRef.initialize(testProps);
 
       TestUtil.logMsg("Initialize logging data from server in Client");
       beanRef.initLogging(p);
@@ -287,7 +285,6 @@ public void test14() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -455,7 +452,6 @@ public void test15() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -645,7 +641,6 @@ public void test16() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1Test.java
index c4387f1b16..daec7d24eb 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1Test.java
@@ -24,35 +24,33 @@
 
 package com.sun.ts.tests.xa.ee.xresXcomp1;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb1Test {
+  public void initialize(Properties p);
 
-public interface Ejb1Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void txDbConnect(String tName) throws RemoteException;
+  public void txDbConnect(String tName);
 
-  public void createData(String tName) throws RemoteException;
+  public void createData(String tName);
 
-  public void insertDup(String tName, String tSize) throws RemoteException;
+  public void insertDup(String tName, String tSize);
 
-  public boolean insert(String tName, int key) throws RemoteException;
+  public boolean insert(String tName, int key);
 
-  public void delete(String tName, int fromKey, int toKey)
-      throws RemoteException;
+  public void delete(String tName, int fromKey, int toKey);
 
-  public Vector getResults(String tName) throws RemoteException;
+  public Vector getResults(String tName);
 
-  public void destroyData(String tName) throws RemoteException;
+  public void destroyData(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void txDbUnConnect(String tName) throws RemoteException;
+  public void txDbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestEJB.java
index 60a7f5f447..bb3c8c3129 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +23,7 @@
  */
 package com.sun.ts.tests.xa.ee.xresXcomp1;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -37,17 +38,12 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb1TestEJB implements SessionBean {
+public class Ejb1TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private java.util.Properties p = null;
-
-  private SessionContext sctx = null;
+  private Properties p = null;
 
   private Properties testProps = null;
 
@@ -57,8 +53,6 @@ public class Ejb1TestEJB implements SessionBean {
 
   private String dbTable1 = null;
 
-  // private Ejb2Test ref = null;
-  // private Ejb2TestHome home = null;
   private TSNamingContext context = null;
 
   private transient PreparedStatement pStmt;
@@ -68,9 +62,9 @@ public class Ejb1TestEJB implements SessionBean {
   // connection
   private DataSource ds1, ds4 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
-  private transient java.sql.Connection con4 = null;
+  private transient Connection con4 = null;
 
   // TSEIS
   private TSEISDataSource ds2, ds3, ds5;
@@ -86,23 +80,13 @@ public class Ejb1TestEJB implements SessionBean {
   public Ejb1TestEJB() {
   }
 
-  public void ejbCreate(java.util.Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
       TestUtil.init(props);
       context = new TSNamingContext();
 
-      // get reference to ejb
-      // eMsg = "Exception doing a lookup for Ejb2Test ";
-      // home = (Ejb2TestHome)context.lookup("java:comp/env/ejb/Ejb2Test",
-      // Ejb2TestHome.class);
-      // ref = home.create(props);
-
-      // TestUtil.logMsg("Initialize logging data from server in Ejb1");
-      // eMsg = "Exception doing a initLogging for Ejb2Test ";
-      // ref.initLogging(p);
-
       eMsg = "Exception looking up size";
       dbSize1 = (Integer) context.lookup("java:comp/env/size");
 
@@ -126,37 +110,13 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
       TestUtil.logMsg("whitebox-tx ds3 : " + ds3);
       TestUtil.logMsg("JDBCwhitebox-tx ds4 : " + ds4);
       TestUtil.logMsg("whitebox-notx ds5 : " + ds5);
-
     } catch (Exception e) {
       TestUtil.logMsg(eMsg);
-      TestUtil.logErr("Ejb1: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    try {
-      TestUtil.logTrace("Ejb1 @setSessionContext");
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("Ejb1: initialize failed", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logMsg("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestHome.java
deleted file mode 100644
index 4c08dee2dd..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/Ejb1TestHome.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb1TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.xresXcomp1;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb1TestHome extends EJBHome {
-  Ejb1Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb1test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb1test_ejb.xml
index e9994a4b36..cf84b3c5d5 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb1test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb1test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb1TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb_vehicle_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb_vehicle_ejb.xml
index d810430fb4..e64476e477 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb_vehicle_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/ejb_vehicle_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_ts_tests_common_vehicle_ejb_EJBVehicle</ejb-name>
-      <home>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome</home>
-      <remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</remote>
+      <business-remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</business-remote>
       <ejb-class>com.sun.ts.tests.common.vehicle.ejb.EJBVehicle</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Bean</transaction-type>
@@ -50,7 +49,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/jsp_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/jsp_vehicle_web.xml
index 4297f6fba1..8ae7fc8be6 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/jsp_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/jsp_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -79,7 +79,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/servlet_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/servlet_vehicle_web.xml
index a8b6feca0c..152e3a7fe4 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/servlet_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/servlet_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -83,7 +83,6 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate1_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate1_ejb.xml
index f5a5dc4c9a..79233db6e6 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate1_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate1_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_xresXcomp1_ejb_TxRequired_Ejb1TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate2_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate2_ejb.xml
index 8bba2b6817..a02fda5aa1 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate2_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_xresXcomp1_ejb_TxRequired_Ejb1TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate3_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate3_ejb.xml
index d07c07072c..212b29857a 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate3_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp1/xa_xresXcomp1_ee_txpropagate3_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_xresXcomp1_ejb_TxRequired_Ejb1TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp1.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Client.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Client.java
index 2d98a67e0b..0d65c4d4e5 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Client.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -41,8 +41,6 @@ public class Client extends ServiceEETest implements Serializable {
 
   private static final String txRef = "java:comp/env/ejb/MyEjbReference";
 
-  private Ejb1TestHome beanHome = null;
-
   private Ejb1Test beanRef = null;
 
   private UserTransaction ut = null;
@@ -82,7 +80,7 @@ public void setup(String args[], Properties p) throws Exception {
       nctx = new TSNamingContext();
 
       TestUtil.logMsg("Lookup Ejb1Test: " + txRef);
-      beanHome = (Ejb1TestHome) nctx.lookup(txRef, Ejb1TestHome.class);
+      beanRef = (Ejb1Test) nctx.lookup(txRef, Ejb1Test.class);
 
       TestUtil.logMsg("Lookup java:comp/UserTransaction");
       ut = (UserTransaction) nctx.lookup("java:comp/UserTransaction");
@@ -106,8 +104,8 @@ public void setup(String args[], Properties p) throws Exception {
       // this.toKey2 = (Integer) nctx.lookup("java:comp/env/toKey2");
       // TestUtil.logTrace("toKey2: " + this.toKey2);
 
-      TestUtil.logMsg("Create EJB instance of " + txRef);
-      beanRef = (Ejb1Test) beanHome.create(testProps);
+      TestUtil.logMsg("Initialize " + txRef);
+      beanRef.initialize(testProps);
 
       TestUtil.logMsg("Initialize logging data from server in Client");
       beanRef.initLogging(p);
@@ -249,7 +247,6 @@ public void test17() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -399,7 +396,6 @@ public void test18() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -575,7 +571,6 @@ public void test19() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -707,7 +702,6 @@ public void test20() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -857,7 +851,6 @@ public void test21() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
@@ -1033,7 +1026,6 @@ public void test22() throws Exception {
         beanRef.destroyData("EIS");
         beanRef.txDbUnConnect("EIS");
         ut.commit();
-        beanRef.remove();
       } catch (Exception e) {
       }
       ;
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1Test.java
index f6e5416ae4..dcaa79769a 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,35 +24,33 @@
 
 package com.sun.ts.tests.xa.ee.xresXcomp2;
 
-import java.rmi.RemoteException;
 import java.util.Properties;
 import java.util.Vector;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb1Test {
+  public void initialize(Properties p);
 
-public interface Ejb1Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void txDbConnect(String tName) throws RemoteException;
+  public void txDbConnect(String tName);
 
-  public void createData(String tName) throws RemoteException;
+  public void createData(String tName);
 
-  public void insertDup(String tName, String tSize) throws RemoteException;
+  public void insertDup(String tName, String tSize);
 
-  public boolean insert(String tName, int key) throws RemoteException;
+  public boolean insert(String tName, int key);
 
-  public void delete(String tName, int fromKey, int toKey)
-      throws RemoteException;
+  public void delete(String tName, int fromKey, int toKey);
 
-  public Vector getResults(String tName) throws RemoteException;
+  public Vector getResults(String tName);
 
-  public void destroyData(String tName) throws RemoteException;
+  public void destroyData(String tName);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void txDbUnConnect(String tName) throws RemoteException;
+  public void txDbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestEJB.java
index 25698d495d..ce3a5e35e1 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +23,7 @@
  */
 package com.sun.ts.tests.xa.ee.xresXcomp2;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -37,17 +38,12 @@
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb1TestEJB implements SessionBean {
+public class Ejb1TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private java.util.Properties p = null;
-
-  private SessionContext sctx = null;
+  private Properties p = null;
 
   private Properties testProps = null;
 
@@ -59,8 +55,6 @@ public class Ejb1TestEJB implements SessionBean {
 
   private Ejb2Test ref = null;
 
-  private Ejb2TestHome home = null;
-
   private TSNamingContext context = null;
 
   private transient PreparedStatement pStmt;
@@ -70,9 +64,9 @@ public class Ejb1TestEJB implements SessionBean {
   // connection
   private DataSource ds1, ds4 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
-  private transient java.sql.Connection con4 = null;
+  private transient Connection con4 = null;
 
   // TSEIS
   private TSEISDataSource ds2, ds3, ds5;
@@ -88,7 +82,7 @@ public class Ejb1TestEJB implements SessionBean {
   public Ejb1TestEJB() {
   }
 
-  public void ejbCreate(java.util.Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
@@ -97,9 +91,8 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
 
       // get reference to ejb
       eMsg = "Exception doing a lookup for Ejb2Test ";
-      home = (Ejb2TestHome) context.lookup("java:comp/env/ejb/Ejb2Test",
-          Ejb2TestHome.class);
-      ref = home.create(props);
+      ref = (Ejb2Test) context.lookup("java:comp/env/ejb/Ejb2Test", Ejb2Test.class);
+      ref.initialize(props);
 
       TestUtil.logMsg("Initialize logging data from server in Ejb1");
       eMsg = "Exception doing a initLogging for Ejb2Test ";
@@ -131,34 +124,11 @@ public void ejbCreate(java.util.Properties props) throws CreateException {
 
     } catch (Exception e) {
       TestUtil.logMsg(eMsg);
-      TestUtil.logErr("Ejb1: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    try {
-      TestUtil.logTrace("Ejb1 @setSessionContext");
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("Ejb1: initialize failed", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logMsg("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestHome.java
deleted file mode 100644
index 2f23decdb1..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb1TestHome.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb1TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.xresXcomp2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb1TestHome extends EJBHome {
-  Ejb1Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2Test.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2Test.java
index 7c24b48acd..1ad7306abb 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2Test.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,21 +24,19 @@
 
 package com.sun.ts.tests.xa.ee.xresXcomp2;
 
-import java.rmi.RemoteException;
-//import jakarta.jms.*;
 import java.util.Properties;
 
-import jakarta.ejb.EJBObject;
+public interface Ejb2Test {
+  public void initialize(Properties p);
 
-public interface Ejb2Test extends EJBObject {
-  public void dbConnect(String tName) throws RemoteException;
+  public void dbConnect(String tName);
 
-  public void insert(String tName, int key) throws RemoteException;
+  public void insert(String tName, int key);
 
-  public void dbUnConnect(String tName) throws RemoteException;
+  public void dbUnConnect(String tName);
 
-  public void initLogging(Properties p) throws RemoteException;
+  public void initLogging(Properties p);
 
-  public void throwEJBException() throws RemoteException;
+  public void throwEJBException();
 
 }
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestEJB.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestEJB.java
index 4b2a2f3b44..2ac0034262 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestEJB.java
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestEJB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,29 +23,23 @@
  */
 package com.sun.ts.tests.xa.ee.xresXcomp2;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Properties;
 
 import javax.sql.DataSource;
 
-//import jakarta.jms.*;
-//import java.rmi.*; 
 import com.sun.ts.lib.util.TSNamingContext;
 import com.sun.ts.lib.util.TestUtil;
 import com.sun.ts.tests.common.connector.whitebox.TSConnection;
 import com.sun.ts.tests.common.connector.whitebox.TSEISDataSource;
 
-import jakarta.ejb.CreateException;
 import jakarta.ejb.EJBException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
 
-public class Ejb2TestEJB implements SessionBean {
+public class Ejb2TestEJB {
   // testProps represent the test specific properties passed in
   // from the test harness.
-  private SessionContext sctx = null;
-
   private TSNamingContext context = null;
 
   private Properties testProps = null;
@@ -57,7 +51,7 @@ public class Ejb2TestEJB implements SessionBean {
 
   private String dbTable1 = null;
 
-  private transient java.sql.Connection con1 = null;
+  private transient Connection con1 = null;
 
   // private transient Statement stmt;
   private transient PreparedStatement pStmt;
@@ -70,7 +64,7 @@ public class Ejb2TestEJB implements SessionBean {
   public Ejb2TestEJB() {
   }
 
-  public void ejbCreate(Properties props) throws CreateException {
+  public void initialize(Properties props) {
     this.testProps = props;
     String eMsg = "";
     try {
@@ -90,34 +84,11 @@ public void ejbCreate(Properties props) throws CreateException {
 
     } catch (Exception e) {
       TestUtil.logTrace(eMsg);
-      TestUtil.logErr("EJB2: ejbCreate failed", e);
-      throw new CreateException(e.getMessage());
-    }
-  }
-
-  public void setSessionContext(SessionContext sc) {
-    TestUtil.logTrace("EJB2 @setSessionContext");
-    try {
-      this.sctx = sc;
-    } catch (Exception e) {
-      TestUtil.logErr("Unexpected Exception setting EJB context/DataSources",
-          e);
+      TestUtil.logErr("EJB2: initialize failed", e);
       throw new EJBException(e.getMessage());
     }
   }
 
-  public void ejbRemove() {
-    TestUtil.logTrace("@ejbRemove");
-  }
-
-  public void ejbActivate() {
-    TestUtil.logTrace("@ejbActivate");
-  }
-
-  public void ejbPassivate() {
-    TestUtil.logTrace("@ejbPassivate");
-  }
-
   // ===========================================================
   public void dbConnect(String tName) {
     TestUtil.logTrace("dbConnect");
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestHome.java b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestHome.java
deleted file mode 100644
index 33bfd30ad4..0000000000
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/Ejb2TestHome.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)Ejb2TestHome.java	1.6 02/02/22
- */
-
-package com.sun.ts.tests.xa.ee.xresXcomp2;
-
-import java.rmi.RemoteException;
-
-import jakarta.ejb.CreateException;
-import jakarta.ejb.EJBHome;
-
-public interface Ejb2TestHome extends EJBHome {
-  Ejb2Test create(java.util.Properties p)
-      throws RemoteException, CreateException;
-
-}
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb1test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb1test_ejb.xml
index 46b6bdb6fa..b91909a676 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb1test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb1test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb1TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -35,7 +34,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb2test_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb2test_ejb.xml
index f482e11087..5e8f0c607f 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb2test_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb2test_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_ejb_TxRequired_Ejb2TestEJB</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb_vehicle_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb_vehicle_ejb.xml
index 2f1710fdb5..043faf74d0 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb_vehicle_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/ejb_vehicle_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>com_sun_ts_tests_common_vehicle_ejb_EJBVehicle</ejb-name>
-      <home>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome</home>
-      <remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</remote>
+      <business-remote>com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote</business-remote>
       <ejb-class>com.sun.ts.tests.common.vehicle.ejb.EJBVehicle</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Bean</transaction-type>
@@ -50,13 +49,11 @@
       <ejb-ref>
         <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
       </ejb-ref>
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/jsp_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/jsp_vehicle_web.xml
index 97ab2c6f83..7d373a397f 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/jsp_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/jsp_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -79,13 +79,11 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
   </ejb-ref>
   <ejb-ref>
     <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/servlet_vehicle_web.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/servlet_vehicle_web.xml
index 0aaf203809..6892836ee0 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/servlet_vehicle_web.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/servlet_vehicle_web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -83,13 +83,11 @@
   <ejb-ref>
     <ejb-ref-name>ejb/MyEjbReference</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
   </ejb-ref>
   <ejb-ref>
     <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
-    <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
     <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
   </ejb-ref>
 </web-app>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate1_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate1_ejb.xml
index 80140d36aa..829c5a7a0a 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate1_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate1_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_xresXcomp2_ejb_TxRequired_Ejb2TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -47,8 +46,7 @@
     </session>
     <session>
       <ejb-name>xa_xresXcomp2_ejb_TxRequired_Ejb1TestEJB1</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -60,7 +58,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate2_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate2_ejb.xml
index a02d49f5db..b5d95457f9 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate2_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate2_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_xresXcomp2_ejb_TxRequired_Ejb2TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -47,8 +46,7 @@
     </session>
     <session>
       <ejb-name>xa_xresXcomp2_ejb_TxRequired_Ejb1TestEJB2</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -60,7 +58,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>
diff --git a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate3_ejb.xml b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate3_ejb.xml
index 7f4d0867be..47e550abc6 100644
--- a/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate3_ejb.xml
+++ b/xa/src/main/java/com/sun/ts/tests/xa/ee/xresXcomp2/xa_xresXcomp2_ee_txpropagate3_ejb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,8 +22,7 @@
   <enterprise-beans>
     <session>
       <ejb-name>xa_xresXcomp2_ejb_TxRequired_Ejb2TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -47,8 +46,7 @@
     </session>
     <session>
       <ejb-name>xa_xresXcomp2_ejb_TxRequired_Ejb1TestEJB3</ejb-name>
-      <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestHome</home>
-      <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</remote>
+      <business-remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1Test</business-remote>
       <ejb-class>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb1TestEJB</ejb-class>
       <session-type>Stateful</session-type>
       <transaction-type>Container</transaction-type>
@@ -60,7 +58,6 @@
       <ejb-ref>
         <ejb-ref-name>ejb/Ejb2Test</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>
-        <home>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2TestHome</home>
         <remote>com.sun.ts.tests.xa.ee.xresXcomp2.Ejb2Test</remote>
       </ejb-ref>
       <resource-ref>