Remove (some) commented out debug code.