HH-31508 cleanup