removed bug-hunting code