More cleanup

1 files changed, 1 insertions, 12 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
index 6481c4cb2c7..36479c7504a 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java
@@ -27,18 +27,7 @@ public interface Model {
      * @param configKey the key to resolve
      * @param configDefinition the config definition to use for the schema
      */
-    @Deprecated // TODO: Return after December 2020
-    ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition configDefinition);
-
-    /**
-     * Resolves config for a given key and config definition
-     *
-     * @param configKey the key to resolve
-     * @param configDefinition the config definition to use for the schema
-     */
-    default ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition configDefinition) {
-        return null; // TODO: Remove this default implementation after December 2020
-    }
+    ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition configDefinition);
 
     /** Produces a set of the valid config keys for this model. */
     Set<ConfigKey<?>> allConfigsProduced();