Swapped out debug code