World removal fixes