Removed heisenbug catching code