[Code] Continue removing of old bug calls.