diff --git a/checkstyle.json b/checkstyle.json
index b187afb..800389c 100644
--- a/checkstyle.json
+++ b/checkstyle.json
@@ -16,6 +16,9 @@
 			},
 			"type": "CatchParameterName"
 		},
+		{
+			"type": "CommentedOutCode"
+		},
 		{
 			"props": {
 				"ignoreExtern": true,
diff --git a/src/refactor/Cli.hx b/src/refactor/Cli.hx
index 9405837..8b00dc6 100644
--- a/src/refactor/Cli.hx
+++ b/src/refactor/Cli.hx
@@ -11,7 +11,6 @@ import refactor.discover.UsageCollector;
 import refactor.discover.UsageContext;
 import refactor.edits.EditableDocument;
 
-// import refactor.cache.FileCache;
 class Cli {
 	var verbose:Bool = false;
 	var forReal:Bool = false;
@@ -109,7 +108,6 @@ class Cli {
 		var startTime = Timer.stamp();
 		TraverseSources.traverseSources(paths, usageContext);
 		usageContext.usageCollector.updateImportHx(usageContext);
-		// usageContext.cache.save();
 
 		var result:Promise<RefactorResult> = Refactor.rename({
 			nameMap: usageContext.nameMap,
diff --git a/src/refactor/rename/RenameAnonStructField.hx b/src/refactor/rename/RenameAnonStructField.hx
index 556cda4..62c1626 100644
--- a/src/refactor/rename/RenameAnonStructField.hx
+++ b/src/refactor/rename/RenameAnonStructField.hx
@@ -12,8 +12,6 @@ class RenameAnonStructField {
 	public static function refactorAnonStructField(context:RefactorContext, file:File, identifier:Identifier,
 			fields:Array<TypedefFieldType>):Promise<RefactorResult> {
 		var changelist:Changelist = new Changelist(context);
-		// var packName:String = file.getPackage();
-		// var mainModuleName = file.getMainModulName();
 
 		changelist.addChange(identifier.pos.fileName, ReplaceText(context.what.toName, identifier.pos), identifier);
 
diff --git a/src/refactor/rename/RenameHelper.hx b/src/refactor/rename/RenameHelper.hx
index 8e3ed4b..bea7367 100644
--- a/src/refactor/rename/RenameHelper.hx
+++ b/src/refactor/rename/RenameHelper.hx
@@ -211,7 +211,6 @@ class RenameHelper {
 											}
 											return typeFromTypeHint(context, typeParams[index]);
 									}
-									// return Promise.resolve(null);
 									return Promise.reject("not found");
 								}));
 						}
@@ -387,7 +386,6 @@ class RenameHelper {
 			context.verboseLog("could not find first parameter for static extension");
 			return Promise.resolve(null);
 		}
-		// var firstParamType:Null<TypeHintType> = null;
 		var changes:Array<Promise<Void>> = [];
 		for (use in firstParam.uses) {
 			switch (use.type) {