diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
index 51a4f9ff1..e66d86801 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
@@ -13,6 +13,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 /**
  * Defines the polling time for the controllers in HH:MM:SS notation.
  * 
+ *
+ *
  */
 
 @ConfigurationProperties(prefix = "hawkbit.controller")
@@ -54,4 +56,5 @@ public class ControllerPollProperties {
     public void setMinPollingTime(String minPollingTime) {
         this.minPollingTime = minPollingTime;
     }
+
 }
diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
index a83004ead..e86bfe8a4 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
@@ -9,7 +9,6 @@
 package org.eclipse.hawkbit.repository.model;
 
 import java.io.Serializable;
-import java.time.Duration;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -25,11 +24,9 @@ import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 
-import org.eclipse.hawkbit.repository.model.helper.DurationHelper;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
@@ -63,12 +60,6 @@ public class TenantMetaData implements Serializable {
     @Column(name = "tenant", nullable = false, length = 40)
     private String tenant;
 
-    @Column(name = "polling_time", nullable = true, length = 10)
-    private String pollingTime;
-
-    @Column(name = "polling_overdue_time", nullable = true, length = 10)
-    private String pollingOverdueTime;
-
     private String createdBy;
     private String lastModifiedBy;
     private Long createdAt;
@@ -86,9 +77,6 @@ public class TenantMetaData implements Serializable {
     // "fk_tenant_md_default_ds_type" )
     private DistributionSetType defaultDsType;
 
-    @Transient
-    private DurationHelper dh = new DurationHelper();
-
     public TenantMetaData() {
     }
 
@@ -268,19 +256,4 @@ public class TenantMetaData implements Serializable {
         return true;
     }
 
-    public Duration getPollingTime() {
-        return dh.formattedStringToDuration(pollingTime);
-    }
-
-    public void setPollingTime(Duration pollingTime) {
-        this.pollingTime = dh.durationToFormattedString(pollingTime);
-    }
-
-    public Duration getPollingOverdueTime() {
-        return dh.formattedStringToDuration(pollingOverdueTime);
-    }
-
-    public void setPollingOverdueTime(Duration pollingOverdueTime) {
-        this.pollingOverdueTime = dh.durationToFormattedString(pollingOverdueTime);
-    }
 }
diff --git a/hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql b/hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql
deleted file mode 100644
index 17ec505bf..000000000
--- a/hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE sp_tenant ADD polling_time varchar(10);
-ALTER TABLE sp_tenant ADD polling_overdue_time varchar(10);
diff --git a/hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql b/hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql
deleted file mode 100644
index 3f0aadde6..000000000
--- a/hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE sp_tenant ADD polling_time varchar(10);
-ALTER TABLE sp_tenant ADD polling_overdue_time varchar(10);
-