diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/IPenaltyList.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/IPenaltyList.java
index 7c1c25aa..060f377f 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/IPenaltyList.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/IPenaltyList.java
@@ -21,6 +21,8 @@ package fr.neatmonster.nocheatplus.actions.types.penalty;
  *
  */
 public interface IPenaltyList {
+    // TODO: Typed ? + typed per input getter (mapped lists)
+    
     /**
      * Add an input-specific penalty.
      * @param penalty
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/InputSpecificPenalty.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/InputSpecificPenalty.java
index b809e785..72b8004b 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/InputSpecificPenalty.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/InputSpecificPenalty.java
@@ -24,6 +24,7 @@ public interface InputSpecificPenalty extends Penalty {
      *            May be of unexpected type.
      * @param registeredInput
      */
+    // TODO: Typed input (generics)?
     // TODO: Consider boolean result for "the input type was accepted", in order to detect if an input is not accepted by any generic penalty.
     public void apply(Object input);
 
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Critical.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Critical.java
index 086a6c6a..b75fc9b7 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Critical.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Critical.java
@@ -101,6 +101,8 @@ public class Critical extends Check {
                         vd.setParameter(ParameterName.TAGS, StringUtil.join(tags, "+"));
                     }
                     cancel = executeActions(vd).willCancel();
+                    // TODO: Introduce penalty instead of cancel.
+                    
                 }
                 auxMoving.returnPlayerMoveInfo(moveInfo);
             }
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
index 701fc450..6d26b93f 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
@@ -467,9 +467,6 @@ public abstract class ConfPaths {
 
     private static final String FIGHT_CRITICAL                           = FIGHT + "critical.";
     public static final String  FIGHT_CRITICAL_CHECK                     = FIGHT_CRITICAL + SUB_ACTIVE;
-    private static final String FIGHT_CRITICAL_CANCEL                    = FIGHT_CRITICAL + "cancel.";
-    public static final String  FIGHT_CRITICAL_CANCEL_CANCEL             = FIGHT_CRITICAL_CANCEL + "cancel";
-    public static final String  FIGHT_CRITICAL_CANCEL_DIVIDEDAMAGE       = FIGHT_CRITICAL_CANCEL + "dividedamage";
     // TODO: Deprecate or rename (->falldistancemin)?
     public static final String  FIGHT_CRITICAL_FALLDISTANCE              = FIGHT_CRITICAL + "falldistance";
     public static final String  FIGHT_CRITICAL_ACTIONS                   = FIGHT_CRITICAL + "actions";
@@ -896,6 +893,10 @@ public abstract class ConfPaths {
     public static final String MOVING_SURVIVALFLY_VLFREEZE               = "checks.moving.survivalfly.vlfreeze";
     @Deprecated
     public static final String  MOVING_SURVIVALFLY_LENIENCY_FREEZETIME      = "checks.moving.survivalfly.leniency.freezetime";
+    @Deprecated
+    public static final String  FIGHT_CRITICAL_CANCEL_CANCEL             = "checks.fight.critical.cancel.cancel";
+    @Deprecated
+    public static final String  FIGHT_CRITICAL_CANCEL_DIVIDEDAMAGE       = "checks.fight.critical.cancel.dividedamage";
 
     /**
      * Get moved paths for which an annotation doesn't work.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
index ecfff527..bff4d7aa 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
@@ -330,8 +330,6 @@ public class DefaultConfig extends ConfigFile {
         set(ConfPaths.FIGHT_ANGLE_ACTIONS, "cancel vl>100 log:angle:3:5:f cancel vl>250 log:angle:0:5:cif cancel", 785);
 
         set(ConfPaths.FIGHT_CRITICAL_CHECK, "default", 785);
-        set(ConfPaths.FIGHT_CRITICAL_CANCEL_CANCEL, 100, 785);
-        set(ConfPaths.FIGHT_CRITICAL_CANCEL_DIVIDEDAMAGE, 1.5, 785);
         set(ConfPaths.FIGHT_CRITICAL_FALLDISTANCE, 0.06251, 785);
         set(ConfPaths.FIGHT_CRITICAL_ACTIONS, "cancel vl>50 log:critical:0:5:cif cancel", 785);