Remove null-check for Block and World