Removed unused code + fixed a bug in CCing with PvP Enabled