more player cleanup optimization