Remove unused import
Cleaning up PartyManager
More cleanup to PartyManager.