Revert "combatV2"

This reverts commit 5307bf577f1cafd5de3656aaab91430c48b926a8.