more cleanup of player ownership