Cleanup, no need for this in PartyManager