cleaned up
enabled hibernate annotations