removing some of the debug code