HHH-8087 - Cleanup