Created [HV-783](https://hibernate.atlassian.net/browse/HV-783) for the clean-ups/refactorings.

Regarding the targeted release version, should the doc changes go into 5.0.0.Final and the refactorings into 5.0.1? Or may only external documentation (reference guide) be changed for the Final? I'm wondering whether we should create a branch for the Final?