diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 940f56b89..2e7640499 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -1189,7 +1189,6 @@ report_computer(FILE * F, faction * f, struct seen_region ** seen, const faction
 		}
 	}
 
-	cr_output_str_list(F, "FEHLER", f->mistakes, f);
 	cr_output_messages(F, f->msgs, f);
 	{
 		struct bmsg * bm;
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 1ea351dce..00403aec3 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -702,7 +702,6 @@ stripfaction (faction * f)
 	if (f->battles) free(f->battles);
 
         /* TODO: free msgs */
-	freestrlist(f->mistakes);
 	freelist(f->allies);
 	free(f->email);
 	free(f->banner);
diff --git a/src/common/kernel/faction.h b/src/common/kernel/faction.h
index e5a2e6c8b..acbb8ba2e 100644
--- a/src/common/kernel/faction.h
+++ b/src/common/kernel/faction.h
@@ -83,7 +83,6 @@ typedef struct faction {
 	struct msglevel * msglevels;
 	struct ally *allies;
 	struct group *groups;
-	struct strlist *mistakes; /* enno: das muß irgendwann noch ganz raus */
 	boolean alive; /* enno: sollte ein flag werden */
 	int nregions;
 	int money;
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index ae11afbe1..8d74ec884 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -560,12 +560,11 @@ factionorders(void)
 			printf(" %4s;", factionid(f));
 			fflush(stdout);
 		}
-		freestrlist(f->mistakes);
-		f->mistakes = 0;
 
 		if (checkpasswd(f, pass, true) == false) {
 		  log_warning(("Invalid password for faction %s\n", fid));
-			addstrlist(&f->mistakes, "Das Passwort wurde falsch eingegeben");
+      ADDMSG(&f->msgs, msg_message("msg_errors", "string",
+        "Das Passwort wurde falsch eingegeben"));
 			return 0;
 		}
 		/* Die Partei hat sich zumindest gemeldet, so daß sie noch
diff --git a/src/eressea/main.c b/src/eressea/main.c
index e9cff5464..7ed172562 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -227,13 +227,6 @@ getgarbage(void)
 
 	/* Get rid of stuff that was only relevant last turn */
 
-	for (f = factions; f; f = f->next) {
-/*		memset(f->showdata, 0, sizeof f->showdata); */
-
-		freestrlist(f->mistakes);
-		f->mistakes = 0;
-		/* TODO: free msgs */
-	}
 #if 0
 	for (r = regions; r; r = r->next) {
 		freestrlist(r->comments);
diff --git a/src/eressea/server.cpp b/src/eressea/server.cpp
index 365de0468..afac30253 100644
--- a/src/eressea/server.cpp
+++ b/src/eressea/server.cpp
@@ -255,30 +255,6 @@ game_init(void)
 #endif
 }
 
-static void
-getgarbage(void)
-{
-  faction *f;
-
-  /* Get rid of stuff that was only relevant last turn */
-
-  for (f = factions; f; f = f->next) {
-    /*		memset(f->showdata, 0, sizeof f->showdata); */
-
-    freestrlist(f->mistakes);
-    f->mistakes = 0;
-    /* TODO: free msgs */
-  }
-#if 0
-  for (r = regions; r; r = r->next) {
-    freestrlist(r->comments);
-    r->comments = 0;
-    freestrlist(r->botschaften);
-    r->botschaften = 0;
-  }
-#endif
-}
-
 #ifdef SHORTPWDS
 static void
 readshortpwds()
@@ -387,9 +363,6 @@ process_orders()
   printf(" - Korrekturen Runde %d\n", turn);
   korrektur();
   turn++;
-  puts(" - entferne Texte der letzten Runde");
-  getgarbage();
-  puts(" - Nehme Korrekturen am Datenbestand vor");
   processorders();
   score();
   remove_unequipped_guarded();