HHH-6613 - Cleanup