[PVP] Remove old stuff