diff --git a/src/utils.py b/src/utils.py
index 6da2af4..802918e 100755
--- a/src/utils.py
+++ b/src/utils.py
@@ -752,8 +752,8 @@ class TrainingState():
 			
 		models = sorted([ int(d[:-8]) for d in os.listdir(f'{self.dataset_dir}/models/') if d[-8:] == "_gpt.pth" ])
 		states = sorted([ int(d[:-6]) for d in os.listdir(f'{self.dataset_dir}/training_state/') if d[-6:] == ".state" ])
-		remove_models = models[:-2]
-		remove_states = states[:-2]
+		remove_models = models[:-keep]
+		remove_states = states[:-keep]
 
 		for d in remove_models:
 			path = f'{self.dataset_dir}/models/{d}_gpt.pth'
@@ -898,6 +898,9 @@ class TrainingState():
 		if should_return:
 			result = "".join(self.buffer) if not self.training_started else message
 
+		if keep_x_past_checkpoints > 0:
+			self.cleanup_old(keep=keep_x_past_checkpoints)
+
 		return (
 			result,
 			percent,