#8 Removed debug code