refactoring player removal