remove uses of org.hibernate.mapping.Collection