HHH-8036 - Cleanup