diff --git a/agent/src/main/java/org/openremote/agent/custom/CustomAgentModelProvider.java b/agent/src/main/java/org/openremote/agent/custom/CustomAgentModelProvider.java
index d066df352..6d1e4629f 100644
--- a/agent/src/main/java/org/openremote/agent/custom/CustomAgentModelProvider.java
+++ b/agent/src/main/java/org/openremote/agent/custom/CustomAgentModelProvider.java
@@ -21,14 +21,6 @@
 package org.openremote.agent.custom;
 
 import org.openremote.model.AssetModelProvider;
-import org.openremote.model.asset.Asset;
-import org.openremote.model.asset.AssetDescriptor;
-import org.openremote.model.value.AttributeDescriptor;
-import org.openremote.model.value.MetaItemDescriptor;
-import org.openremote.model.value.ValueDescriptor;
-
-import java.util.List;
-import java.util.Map;
 
 public class CustomAgentModelProvider implements AssetModelProvider {
 
@@ -36,29 +28,4 @@ public class CustomAgentModelProvider implements AssetModelProvider {
     public boolean useAutoScan() {
         return true;
     }
-
-    @Override
-    public AssetDescriptor<?>[] getAssetDescriptors() {
-        return new AssetDescriptor<?>[0];
-    }
-
-    @Override
-    public Map<Class<? extends Asset<?>>, List<AttributeDescriptor<?>>> getAttributeDescriptors() {
-        return null;
-    }
-
-    @Override
-    public Map<Class<? extends Asset<?>>, List<MetaItemDescriptor<?>>> getMetaItemDescriptors() {
-        return null;
-    }
-
-    @Override
-    public Map<Class<? extends Asset<?>>, List<ValueDescriptor<?>>> getValueDescriptors() {
-        return null;
-    }
-
-    @Override
-    public void onAssetModelFinished() {
-
-    }
 }
diff --git a/model/src/main/java/org/openremote/model/custom/CustomAssetModelProvider.java b/model/src/main/java/org/openremote/model/custom/CustomAssetModelProvider.java
index 7a6dd6070..206f7cc4a 100644
--- a/model/src/main/java/org/openremote/model/custom/CustomAssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/custom/CustomAssetModelProvider.java
@@ -20,14 +20,6 @@
 package org.openremote.model.custom;
 
 import org.openremote.model.AssetModelProvider;
-import org.openremote.model.asset.Asset;
-import org.openremote.model.asset.AssetDescriptor;
-import org.openremote.model.value.AttributeDescriptor;
-import org.openremote.model.value.MetaItemDescriptor;
-import org.openremote.model.value.ValueDescriptor;
-
-import java.util.List;
-import java.util.Map;
 
 public class CustomAssetModelProvider implements AssetModelProvider {
 
@@ -35,29 +27,4 @@ public class CustomAssetModelProvider implements AssetModelProvider {
     public boolean useAutoScan() {
         return true;
     }
-
-    @Override
-    public AssetDescriptor<?>[] getAssetDescriptors() {
-        return new AssetDescriptor[0];
-    }
-
-    @Override
-    public Map<Class<? extends Asset<?>>, List<AttributeDescriptor<?>>> getAttributeDescriptors() {
-        return null;
-    }
-
-    @Override
-    public Map<Class<? extends Asset<?>>, List<MetaItemDescriptor<?>>> getMetaItemDescriptors() {
-        return null;
-    }
-
-    @Override
-    public Map<Class<? extends Asset<?>>, List<ValueDescriptor<?>>> getValueDescriptors() {
-        return null;
-    }
-
-    @Override
-    public void onAssetModelFinished() {
-
-    }
 }
diff --git a/openremote b/openremote
index 09cb7ec74..dae58f0d4 160000
--- a/openremote
+++ b/openremote
@@ -1 +1 @@
-Subproject commit 09cb7ec745ee97eedc5c67ea03fdc2362518fafa
+Subproject commit dae58f0d40b306528146d5fd26ac3750bb416c78