PersistentCollection and PersistenceBuilder cleanup