diff --git a/.golangci.yml b/.golangci.yml
index 947b3dac..12fd530d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -21,7 +21,7 @@ linters:
     - nakedret
     - misspell
     - staticcheck
-    # - typecheck
+    - typecheck
     - unused
     - unconvert
     - vet
diff --git a/avi/data_source_avi_controllerproperties_test.go b/avi/data_source_avi_controllerproperties_test.go
index ab0a9bce..f2d47ff8 100644
--- a/avi/data_source_avi_controllerproperties_test.go
+++ b/avi/data_source_avi_controllerproperties_test.go
@@ -45,14 +45,8 @@ func TestAVIDataSourceControllerPropertiesBasic(t *testing.T) {
 						"avi_controllerproperties.testControllerProperties", "enable_memory_balancer", "true"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "max_dead_se_in_grp", "1"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
 					resource.TestCheckResourceAttr(
@@ -125,10 +119,7 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_pcap_per_tenant = "4"
 	enable_memory_balancer = true
 	max_dead_se_in_grp = "1"
-	seupgrade_fabric_pool_size = "20"
 	vs_key_rotate_period = "60"
-	seupgrade_segroup_min_dead_timeout = "360"
-	upgrade_lease_time = "360"
 	se_create_timeout = "900"
 	query_host_fail = "180"
 	bm_use_ansible = true
diff --git a/avi/resource_avi_controllerproperties_test.go b/avi/resource_avi_controllerproperties_test.go
index f7d4a404..5cc1d176 100644
--- a/avi/resource_avi_controllerproperties_test.go
+++ b/avi/resource_avi_controllerproperties_test.go
@@ -49,10 +49,6 @@ func TestAVIControllerPropertiesBasic(t *testing.T) {
 						"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
 					resource.TestCheckResourceAttr(
@@ -139,10 +135,6 @@ func TestAVIControllerPropertiesBasic(t *testing.T) {
 						"avi_controllerproperties.testControllerProperties", "seupgrade_fabric_pool_size", "20"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "vs_key_rotate_period", "60"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "seupgrade_segroup_min_dead_timeout", "360"),
-					resource.TestCheckResourceAttr(
-						"avi_controllerproperties.testControllerProperties", "upgrade_lease_time", "360"),
 					resource.TestCheckResourceAttr(
 						"avi_controllerproperties.testControllerProperties", "se_create_timeout", "900"),
 					resource.TestCheckResourceAttr(
@@ -246,8 +238,6 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_dead_se_in_grp = "1"
 	seupgrade_fabric_pool_size = "20"
 	vs_key_rotate_period = "60"
-	seupgrade_segroup_min_dead_timeout = "360"
-	upgrade_lease_time = "360"
 	se_create_timeout = "900"
 	query_host_fail = "180"
 	bm_use_ansible = true
@@ -294,8 +284,6 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_dead_se_in_grp = "1"
 	seupgrade_fabric_pool_size = "20"
 	vs_key_rotate_period = "60"
-	seupgrade_segroup_min_dead_timeout = "360"
-	upgrade_lease_time = "360"
 	se_create_timeout = "900"
 	query_host_fail = "180"
 	bm_use_ansible = true