As a first step, the following is being deleted:

• org.hibernate.loader.plan (entire package)
• org.hibernate.loader.spi classes used only by org.hibernate.loader.plan
• org.hibernate.loader.spi classes related to LoadPlanAdvisor
• org.hibernate.jpa.graph.internal.advisor (entire package)
• org.hibernate.jpa.test.graphs.BasicGraphLoadPlanAdviceTests