HHH-7357 - Cleanup