remove commented code
use latest hibernate version
remove whitespace