[hibernate-issues] [JIRA] (HSEARCH-3588) Clean up TODOs in the code