Issue #30: Removed debug code