diff --git a/std/living/combat.c b/std/living/combat.c
index 8400d4c..2cab731 100644
--- a/std/living/combat.c
+++ b/std/living/combat.c
@@ -44,14 +44,12 @@
 
 // globale Variablen
 nosave mapping enemies;
-private nosave string magic_attack;
 private nosave int attack_busy;
 nosave int no_more_attacks;
 private nosave int remaining_heart_beats;
 private nosave int att2_time;
 private nosave string last_attack_msg;
 private nosave object *missing_attacks;
-private nosave mapping peace_tries;
 // Cache fuer QueryArmourByType()
 private nosave mapping QABTCache;
 
@@ -71,7 +69,6 @@
   attack_busy=100;
   att2_time=0;
   enemies=([]);
-  peace_tries=([]);
   team::create(); 
   offerHook(H_HOOK_DEFEND,1);
   offerHook(H_HOOK_ATTACK,1);
@@ -216,7 +213,7 @@
  * Fuegt ob der Feindesliste hinzu.
  */
 public int Kill(object ob)
-{ int   res, arena;
+{ int   res;
   int|string no_attack;
 
   if ( !objectp(ob) )
@@ -925,7 +922,7 @@
 
 protected string mess(string msg,object me,object enemy)
 { closure mname, ename;
-  string  *parts,x;
+  string  *parts;
   int     i;
 
   mname = symbol_function("name", me);
@@ -997,11 +994,11 @@
 
 public int Defend(int dam, string|string* dam_type, int|mapping spell, object enemy)
 {
-  int     i,k;
   mixed   res,res2;
   object  *armours,tmp;
   mixed hookData;
   mixed hookRes;
+  int i;
 
   //  string  what, how;
   string enname, myname;
@@ -1629,7 +1626,6 @@
 
 public varargs mapping StopHuntingMode(int silent)
 { mapping save_enemy;
-  int     i;
 
   save_enemy=enemies;
   if ( !silent )