Remove combat redundancy
Remove combat redundancy