HHH-8022 - Cleanup