fix player remove cleanup