HHH-8193 - Cleanup