Simplify code
Update spring, hibernate and uadetector