Cleanup for Hibernate