Some layout cleanup
Remove some unnecessary imports
Avoid some deprecated JOOQ API.