KD - removed combat.rb