HHH-8087 - Cleanup
(cherry picked from commit 03a56f58b99e0da977e395ae0af5d71edb77fb2f)