Eliminate some debug code
Eliminated some debug code