Cleaning up hibernate classes