Well you *could* remove the sword by editing the unit's stats. Ought to fix it.