Removed hard-coded debug code