diff --git a/datamodel.teemip-ip-discovery.xml b/datamodel.teemip-ip-discovery.xml
index 8eebc20..254b549 100755
--- a/datamodel.teemip-ip-discovery.xml
+++ b/datamodel.teemip-ip-discovery.xml
@@ -97,31 +97,6 @@
         </field>
       </fields>
       <methods>
-        <method id="OnInsert">
-          <comment/>
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-          <code><![CDATA[ public function OnInsert()
-	{
-		parent::OnInsert();
-
-        // Generate an ID until (very likely) it is unique amongst the existing UUID
-        //
-        $oSearchDup = DBObjectSearch::FromOQL_AllData("SELECT IPDiscovery WHERE uuid LIKE :sUUID");
-        do
-        {
-            $sId = strtoupper(md5(uniqid(rand(), true)));
-            $sFinalId = substr($sId, 0, 4).'_'.substr($sId, 4, 4).'_'.substr($sId, 8, 4).'_'.substr($sId, 12, 4);
-
-            $oDupSet = new DBObjectSet($oSearchDup, array(), array('sUUID' => $sFinalId));
-            $bFound = ($oDupSet->Count() > 0);
-        }
-        while ($bFound);
-        $this->Set('uuid', $sFinalId);
-
-    }]]></code>
-        </method>
         <method id="DoCheckToWrite">
           <comment/>
           <static>false</static>
@@ -140,46 +115,6 @@
 				return;
 			}
 		}
-    }]]></code>
-        </method>
-        <method id="DisplayBareRelations">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-          <code><![CDATA[ public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, $bEditMode);
-
-		$oPage->RemoveTab(Dict::S('Class:FunctionalCI/Tab:OpenedTickets'));
-
-    }]]></code>
-        </method>
-        <method id="GetAttributeFlags">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-          <code><![CDATA[ public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		if ($sAttCode == 'uuid')
-		{
-				return OPT_ATT_READONLY;
-		}
-		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-
-    }]]></code>
-        </method>
-        <method id="GetInitialStateAttributeFlags">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-          <code><![CDATA[ public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
-	{
-		if ($sAttCode == 'uuid')
-		{
-				return OPT_ATT_READONLY;
-		}
-		return parent::GetInitialStateAttributeFlags($sAttCode, $aReasons);
-
     }]]></code>
         </method>
       </methods>
diff --git a/extension.xml b/extension.xml
deleted file mode 100755
index 702df07..0000000
--- a/extension.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension format="1.0">
-	<extension_code>teemip-ip-discovery</extension_code>
-	<version>0.2.1</version>
-	<label><![CDATA[IP discovery]]></label>
-	<description><![CDATA[TeemIp extension that discovers active IPs within subnets]]></description>
-	<mandatory>false</mandatory>
-	<more_info_url>https://wiki.teemip.net/doku.php?id=extensions:teemip-ip-discovery</more_info_url>
-</extension>
diff --git a/module.teemip-ip-discovery.php b/module.teemip-ip-discovery.php
index 87b78e0..bcafcfb 100755
--- a/module.teemip-ip-discovery.php
+++ b/module.teemip-ip-discovery.php
@@ -1,7 +1,7 @@
 <?php
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'teemip-ip-discovery/0.2.2',
+	'teemip-ip-discovery/0.3.0',
 	array(
 		// Identification
 		//
@@ -11,7 +11,7 @@
 		// Setup
 		//
 		'dependencies' => array(
-			'teemip-ip-mgmt/2.3.0',
+			'teemip-ip-mgmt/2.5.0',
 		),
 		'mandatory' => false,
 		'visible' => true,