remove uses of org.hibernate.mapping.SingleTableSubclass and org.hibernate.mapping.JoinedSubclass