HG-132 commented, removed debug logging