Player remove fixes and entity remove progress