Improved handling of removing units/players