HHH-8243 - Cleanup