cleanup handlePvP and messages