Hsearch 1373 prequel cleanup

Related to ORM 4.3 upgrade, but not resolving the issue yet.