Hibernate mappings
Revert "Hibernate mappings"

This reverts commit 13e421cb6a50db190c37a18390c70545a013c9b2.