diff --git a/.golangci.yml b/.golangci.yml
index b21eb60..6c104b8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -28,6 +28,8 @@ linters-settings:
       - -SA1019
   nestif:
     min-complexity: 7
+  gocyclo:
+    min-complexity: 40
 
 issues:
   max-same-issues: 0
diff --git a/internal/service/cloudapi/account/resource_account.go b/internal/service/cloudapi/account/resource_account.go
index 4a87285..4013760 100644
--- a/internal/service/cloudapi/account/resource_account.go
+++ b/internal/service/cloudapi/account/resource_account.go
@@ -233,20 +233,6 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, m interf
 	return nil
 }
 
-func resourceAccountExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceAccountExists")
-
-	account, err := utilityAccountCheckPresence(ctx, d, m)
-	if account == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceAccountEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceAccountEdit")
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudapi/bservice/resource_bservice.go b/internal/service/cloudapi/bservice/resource_bservice.go
index ab5ff65..f8a3ed0 100644
--- a/internal/service/cloudapi/bservice/resource_bservice.go
+++ b/internal/service/cloudapi/bservice/resource_bservice.go
@@ -143,20 +143,6 @@ func resourceBasicServiceDelete(ctx context.Context, d *schema.ResourceData, m i
 	return nil
 }
 
-func resourceBasicServiceExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceBasicServiceExists")
-
-	bservice, err := utilityBasicServiceCheckPresence(ctx, d, m)
-	if bservice == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceBasicServiceEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceBasicServiceEdit")
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudapi/bservice/resource_bservice_group.go b/internal/service/cloudapi/bservice/resource_bservice_group.go
index 145af41..2c0e28f 100644
--- a/internal/service/cloudapi/bservice/resource_bservice_group.go
+++ b/internal/service/cloudapi/bservice/resource_bservice_group.go
@@ -183,20 +183,6 @@ func resourceBasicServiceGroupDelete(ctx context.Context, d *schema.ResourceData
 	return nil
 }
 
-func resourceBasicServiceGroupExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceBasicServiceGroupExists")
-
-	bserviceGroup, err := utilityBasicServiceGroupCheckPresence(ctx, d, m)
-	if bserviceGroup == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceBasicServiceGroupEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceBasicServiceGroupEdit")
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudapi/disks/resource_disk.go b/internal/service/cloudapi/disks/resource_disk.go
index 9cb264b..2ab95c4 100644
--- a/internal/service/cloudapi/disks/resource_disk.go
+++ b/internal/service/cloudapi/disks/resource_disk.go
@@ -281,18 +281,6 @@ func resourceDiskDelete(ctx context.Context, d *schema.ResourceData, m interface
 	return nil
 }
 
-func resourceDiskExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-
-	diskFacts, err := utilityDiskCheckPresence(ctx, d, m)
-	if diskFacts == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func resourceDiskSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"account_id": {
diff --git a/internal/service/cloudapi/extnet/data_source_extnet_default.go b/internal/service/cloudapi/extnet/data_source_extnet_default.go
index 22463eb..765f998 100644
--- a/internal/service/cloudapi/extnet/data_source_extnet_default.go
+++ b/internal/service/cloudapi/extnet/data_source_extnet_default.go
@@ -42,7 +42,7 @@ import (
 )
 
 func dataSourceExtnetDefaultRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	extnetId, err := utilityExtnetDefaultCheckPresence(ctx, d, m)
+	extnetId, err := utilityExtnetDefaultCheckPresence(ctx, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/internal/service/cloudapi/extnet/utility_extnet_default.go b/internal/service/cloudapi/extnet/utility_extnet_default.go
index 7b7257b..f94eda2 100644
--- a/internal/service/cloudapi/extnet/utility_extnet_default.go
+++ b/internal/service/cloudapi/extnet/utility_extnet_default.go
@@ -37,11 +37,9 @@ import (
 
 	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityExtnetDefaultCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
+func utilityExtnetDefaultCheckPresence(ctx context.Context, m interface{}) (string, error) {
 	c := m.(*controller.ControllerCfg)
 	urlValues := &url.Values{}
 
diff --git a/internal/service/cloudapi/image/resource_image.go b/internal/service/cloudapi/image/resource_image.go
index f963141..4902535 100644
--- a/internal/service/cloudapi/image/resource_image.go
+++ b/internal/service/cloudapi/image/resource_image.go
@@ -192,20 +192,6 @@ func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interfac
 	return nil
 }
 
-func resourceImageExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceImageExists: called for %s, id: %s", d.Get("name").(string), d.Id())
-
-	image, err := utilityImageCheckPresence(ctx, d, m)
-	if image == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceImageEditName(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	log.Debugf("resourceImageEditName: called for %s, id: %s", d.Get("name").(string), d.Id())
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudapi/k8s/resource_k8s.go b/internal/service/cloudapi/k8s/resource_k8s.go
index a7f6301..99dca28 100644
--- a/internal/service/cloudapi/k8s/resource_k8s.go
+++ b/internal/service/cloudapi/k8s/resource_k8s.go
@@ -274,17 +274,6 @@ func resourceK8sDelete(ctx context.Context, d *schema.ResourceData, m interface{
 	return nil
 }
 
-func resourceK8sExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceK8sExists: called with id %s, rg %d", d.Id(), d.Get("rg_id").(int))
-
-	k8s, err := utilityK8sCheckPresence(ctx, d, m)
-	if k8s == nil {
-		return false, err
-	}
-
-	return true, nil
-}
-
 func resourceK8sSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"name": {
diff --git a/internal/service/cloudapi/k8s/resource_k8s_wg.go b/internal/service/cloudapi/k8s/resource_k8s_wg.go
index d1eeafb..b167d7d 100644
--- a/internal/service/cloudapi/k8s/resource_k8s_wg.go
+++ b/internal/service/cloudapi/k8s/resource_k8s_wg.go
@@ -169,20 +169,6 @@ func resourceK8sWgDelete(ctx context.Context, d *schema.ResourceData, m interfac
 	return nil
 }
 
-func resourceK8sWgExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceK8sWgExists: called with k8s id %d", d.Get("k8s_id").(int))
-
-	wg, err := utilityK8sWgCheckPresence(ctx, d, m)
-	if wg == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"k8s_id": {
diff --git a/internal/service/cloudapi/kvmvm/data_source_compute.go b/internal/service/cloudapi/kvmvm/data_source_compute.go
index 652191c..2999e3b 100644
--- a/internal/service/cloudapi/kvmvm/data_source_compute.go
+++ b/internal/service/cloudapi/kvmvm/data_source_compute.go
@@ -76,36 +76,6 @@ func parseComputeDisksToExtraDisks(disks []DiskRecord) []interface{} {
 	return result
 }
 
-func parseBootDiskSize(disks []DiskRecord) int {
-	// this return value will be used to d.Set("boot_disk_size",) item of dataSourceCompute schema
-	if len(disks) == 0 {
-		return 0
-	}
-
-	for _, value := range disks {
-		if value.Type == "B" {
-			return value.SizeMax
-		}
-	}
-
-	return 0
-}
-
-func parseBootDiskId(disks []DiskRecord) uint {
-	// this return value will be used to d.Set("boot_disk_id",) item of dataSourceCompute schema
-	if len(disks) == 0 {
-		return 0
-	}
-
-	for _, value := range disks {
-		if value.Type == "B" {
-			return value.ID
-		}
-	}
-
-	return 0
-}
-
 func findBootDisk(disks []DiskRecord) *DiskRecord {
 	for _, d := range disks {
 		if d.Type == "B" {
diff --git a/internal/service/cloudapi/kvmvm/resource_compute.go b/internal/service/cloudapi/kvmvm/resource_compute.go
index 9b8eac8..6bf5c49 100644
--- a/internal/service/cloudapi/kvmvm/resource_compute.go
+++ b/internal/service/cloudapi/kvmvm/resource_compute.go
@@ -131,14 +131,15 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 	cleanup := false
 	defer func() {
 		if cleanup {
-			utilityComputeDetachDisks(ctx, d, m)
 			urlValues := &url.Values{}
 			urlValues.Add("computeId", d.Id())
 			urlValues.Add("permanently", "1")
+			urlValues.Add("detachDisks", "1")
 
 			if _, err := c.DecortAPICall(ctx, "POST", ComputeDeleteAPI, urlValues); err != nil {
 				log.Errorf("resourceComputeCreate: could not delete compute after failed creation: %v", err)
 			}
+			d.SetId("")
 		}
 	}()
 
@@ -313,16 +314,12 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	log.Debugf("resourceComputeDelete: called for Compute name %s, RG ID %d",
 		d.Get("name").(string), d.Get("rg_id").(int))
 
-	if err := utilityComputeDetachDisks(ctx, d, m); err != nil {
-		return diag.FromErr(err)
-	}
-
 	c := m.(*controller.ControllerCfg)
 
 	params := &url.Values{}
 	params.Add("computeId", d.Id())
 	params.Add("permanently", "1")
-	// TODO: this is for the upcoming API update - params.Add("detachdisks", "1")
+	params.Add("detachDisks", "1")
 
 	if _, err := c.DecortAPICall(ctx, "POST", ComputeDeleteAPI, params); err != nil {
 		return diag.FromErr(err)
@@ -331,21 +328,6 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	return nil
 }
 
-func resourceComputeExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	// Reminder: according to Terraform rules, this function should not modify its ResourceData argument
-	log.Debugf("resourceComputeExist: called for Compute name %s, RG ID %d",
-		d.Get("name").(string), d.Get("rg_id").(int))
-
-	compFacts, err := utilityComputeCheckPresence(ctx, d, m)
-	if compFacts == "" {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func ResourceCompute() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
diff --git a/internal/service/cloudapi/kvmvm/utility_compute.go b/internal/service/cloudapi/kvmvm/utility_compute.go
index 27fd4bb..0bf64ea 100644
--- a/internal/service/cloudapi/kvmvm/utility_compute.go
+++ b/internal/service/cloudapi/kvmvm/utility_compute.go
@@ -308,45 +308,3 @@ func utilityComputeCheckPresence(ctx context.Context, d *schema.ResourceData, m
 
 	return "", nil // there should be no error if Compute does not exist
 }
-
-func utilityComputeDetachDisks(ctx context.Context, d *schema.ResourceData, m interface{}) error {
-	compFacts, err := utilityComputeCheckPresence(ctx, d, m)
-	if compFacts == "" {
-		if err != nil {
-			return err
-		}
-		// the target Compute does not exist - in this case according to Terraform best practice
-		// we exit from Destroy method without error
-		return nil
-	}
-
-	c := m.(*controller.ControllerCfg)
-
-	model := ComputeGetResp{}
-	log.Debugf("resourceComputeDelete: ready to unmarshal string %s", compFacts)
-	err = json.Unmarshal([]byte(compFacts), &model)
-
-	if err != nil && len(model.Disks) > 0 {
-		// prepare to detach data disks from compute - do it only if compFacts unmarshalled
-		// properly and the resulting model contains non-empty Disks list
-		for _, diskFacts := range model.Disks {
-			if diskFacts.Type == "B" {
-				// boot disk is never detached on compute delete
-				continue
-			}
-
-			log.Debugf("utilityComputeDetachDisks: ready to detach data disk ID %d from compute ID %s", diskFacts.ID, d.Id())
-
-			detachParams := &url.Values{}
-			detachParams.Add("computeId", d.Id())
-			detachParams.Add("diskId", fmt.Sprintf("%d", diskFacts.ID))
-
-			if _, err := c.DecortAPICall(ctx, "POST", ComputeDiskDetachAPI, detachParams); err != nil {
-				// We do not fail compute deletion on data disk detach errors
-				log.Errorf("utilityComputeDetachDisks: error when detaching Disk ID %d: %s", diskFacts.ID, err)
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/internal/service/cloudapi/locations/data_source_locations_url.go b/internal/service/cloudapi/locations/data_source_locations_url.go
index b06d55b..9f1eac8 100644
--- a/internal/service/cloudapi/locations/data_source_locations_url.go
+++ b/internal/service/cloudapi/locations/data_source_locations_url.go
@@ -41,9 +41,8 @@ import (
 )
 
 func dataSourceLocationUrlRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	url, err := utilityLocationUrlCheckPresence(ctx, d, m)
+	url, err := utilityLocationUrlCheckPresence(ctx, m)
 	if err != nil {
-
 		return diag.FromErr(err)
 	}
 
diff --git a/internal/service/cloudapi/locations/utility_location_url.go b/internal/service/cloudapi/locations/utility_location_url.go
index 9ebc215..8f63879 100644
--- a/internal/service/cloudapi/locations/utility_location_url.go
+++ b/internal/service/cloudapi/locations/utility_location_url.go
@@ -38,11 +38,9 @@ import (
 
 	"github.com/rudecs/terraform-provider-decort/internal/controller"
 	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityLocationUrlCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
+func utilityLocationUrlCheckPresence(ctx context.Context, m interface{}) (string, error) {
 	c := m.(*controller.ControllerCfg)
 
 	log.Debugf("utilityLocationUrlCheckPresence: load locations list")
@@ -54,7 +52,7 @@ func utilityLocationUrlCheckPresence(ctx context.Context, d *schema.ResourceData
 	location := new(string)
 	err = json.Unmarshal([]byte(locationUrl), location)
 	if err != nil {
-		return "", nil
+		return "", err
 	}
 
 	return *location, nil
diff --git a/internal/service/cloudapi/pfw/resource_pfw.go b/internal/service/cloudapi/pfw/resource_pfw.go
index 199187b..70b3e75 100644
--- a/internal/service/cloudapi/pfw/resource_pfw.go
+++ b/internal/service/cloudapi/pfw/resource_pfw.go
@@ -122,20 +122,6 @@ func resourcePfwDelete(ctx context.Context, d *schema.ResourceData, m interface{
 	return nil
 }
 
-func resourcePfwExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourcePfwExists: called for compute %d, rule %s", d.Get("compute_id").(int), d.Id())
-
-	pfw, err := utilityPfwCheckPresence(ctx, d, m)
-	if pfw == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourcePfwSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"compute_id": {
diff --git a/internal/service/cloudapi/rg/resource_rg.go b/internal/service/cloudapi/rg/resource_rg.go
index d893334..09334ba 100644
--- a/internal/service/cloudapi/rg/resource_rg.go
+++ b/internal/service/cloudapi/rg/resource_rg.go
@@ -297,18 +297,6 @@ func resourceResgroupDelete(ctx context.Context, d *schema.ResourceData, m inter
 	return nil
 }
 
-func resourceResgroupExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	// Reminder: according to Terraform rules, this function should NOT modify ResourceData argument
-	rg_facts, err := utilityResgroupCheckPresence(ctx, d, m)
-	if rg_facts == "" {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func ResourceResgroup() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
diff --git a/internal/service/cloudapi/snapshot/resource_snapshot.go b/internal/service/cloudapi/snapshot/resource_snapshot.go
index 9a8fbc7..2169720 100644
--- a/internal/service/cloudapi/snapshot/resource_snapshot.go
+++ b/internal/service/cloudapi/snapshot/resource_snapshot.go
@@ -101,18 +101,6 @@ func resourceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m inter
 	return nil
 }
 
-func resourceSnapshotExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	snapshot, err := utilitySnapshotCheckPresence(ctx, d, m)
-	if err != nil {
-		return false, err
-	}
-	if snapshot == nil {
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceSnapshotEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	if d.HasChange("rollback") {
 		if d.Get("rollback").(bool) {
diff --git a/internal/service/cloudapi/vins/resource_vins.go b/internal/service/cloudapi/vins/resource_vins.go
index 22729f6..a394b87 100644
--- a/internal/service/cloudapi/vins/resource_vins.go
+++ b/internal/service/cloudapi/vins/resource_vins.go
@@ -210,21 +210,6 @@ func resourceVinsDelete(ctx context.Context, d *schema.ResourceData, m interface
 	return nil
 }
 
-func resourceVinsExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	// Reminder: according to Terraform rules, this function should not modify its ResourceData argument
-	log.Debugf("resourceVinsExists: called for ViNS name %s, Account ID %d, RG ID %d",
-		d.Get("name").(string), d.Get("account_id").(int), d.Get("rg_id").(int))
-
-	vinsFacts, err := utilityVinsCheckPresence(ctx, d, m)
-	if vinsFacts == "" {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func resourceVinsSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"name": {
diff --git a/internal/service/cloudbroker/account/api.go b/internal/service/cloudbroker/account/api.go
index 3ed17ed..5e30619 100644
--- a/internal/service/cloudbroker/account/api.go
+++ b/internal/service/cloudbroker/account/api.go
@@ -49,6 +49,8 @@ const accountListVinsAPI = "/restmachine/cloudbroker/account/listVins"
 const accountRestoreAPI = "/restmachine/cloudbroker/account/restore"
 const accountUpdateAPI = "/restmachine/cloudbroker/account/update"
 const accountUpdateUserAPI = "/restmachine/cloudbroker/account/updateUser"
-const accountsEnableAPI = "/restmachine/cloudbroker/account/enableAccounts"
-const accountsDisableAPI = "/restmachine/cloudbroker/account/disableAccounts"
-const accountsDeleteAPI = "/restmachine/cloudbroker/account/deleteAccounts"
+
+//currently unused
+//const accountsEnableAPI = "/restmachine/cloudbroker/account/enableAccounts"
+//const accountsDisableAPI = "/restmachine/cloudbroker/account/disableAccounts"
+//const accountsDeleteAPI = "/restmachine/cloudbroker/account/deleteAccounts"
diff --git a/internal/service/cloudbroker/account/resource_account.go b/internal/service/cloudbroker/account/resource_account.go
index 2647b9d..0c33d51 100644
--- a/internal/service/cloudbroker/account/resource_account.go
+++ b/internal/service/cloudbroker/account/resource_account.go
@@ -228,20 +228,6 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, m interf
 	return nil
 }
 
-func resourceAccountExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceAccountExists")
-
-	account, err := utilityAccountCheckPresence(ctx, d, m)
-	if account == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceAccountEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceAccountEdit")
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudbroker/disks/resource_disk.go b/internal/service/cloudbroker/disks/resource_disk.go
index 9cb264b..2ab95c4 100644
--- a/internal/service/cloudbroker/disks/resource_disk.go
+++ b/internal/service/cloudbroker/disks/resource_disk.go
@@ -281,18 +281,6 @@ func resourceDiskDelete(ctx context.Context, d *schema.ResourceData, m interface
 	return nil
 }
 
-func resourceDiskExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-
-	diskFacts, err := utilityDiskCheckPresence(ctx, d, m)
-	if diskFacts == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func resourceDiskSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"account_id": {
diff --git a/internal/service/cloudbroker/image/resource_image.go b/internal/service/cloudbroker/image/resource_image.go
index b578709..8868b2e 100644
--- a/internal/service/cloudbroker/image/resource_image.go
+++ b/internal/service/cloudbroker/image/resource_image.go
@@ -211,20 +211,6 @@ func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interfac
 	return nil
 }
 
-func resourceImageExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceImageExists: called for %s, id: %s", d.Get("name").(string), d.Id())
-
-	image, err := utilityImageCheckPresence(ctx, d, m)
-	if image == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceImageEditName(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	log.Debugf("resourceImageEditName: called for %s, id: %s", d.Get("name").(string), d.Id())
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudbroker/k8s/resource_k8s.go b/internal/service/cloudbroker/k8s/resource_k8s.go
index a7f6301..99dca28 100644
--- a/internal/service/cloudbroker/k8s/resource_k8s.go
+++ b/internal/service/cloudbroker/k8s/resource_k8s.go
@@ -274,17 +274,6 @@ func resourceK8sDelete(ctx context.Context, d *schema.ResourceData, m interface{
 	return nil
 }
 
-func resourceK8sExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceK8sExists: called with id %s, rg %d", d.Id(), d.Get("rg_id").(int))
-
-	k8s, err := utilityK8sCheckPresence(ctx, d, m)
-	if k8s == nil {
-		return false, err
-	}
-
-	return true, nil
-}
-
 func resourceK8sSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"name": {
diff --git a/internal/service/cloudbroker/k8s/resource_k8s_wg.go b/internal/service/cloudbroker/k8s/resource_k8s_wg.go
index d1eeafb..b167d7d 100644
--- a/internal/service/cloudbroker/k8s/resource_k8s_wg.go
+++ b/internal/service/cloudbroker/k8s/resource_k8s_wg.go
@@ -169,20 +169,6 @@ func resourceK8sWgDelete(ctx context.Context, d *schema.ResourceData, m interfac
 	return nil
 }
 
-func resourceK8sWgExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceK8sWgExists: called with k8s id %d", d.Get("k8s_id").(int))
-
-	wg, err := utilityK8sWgCheckPresence(ctx, d, m)
-	if wg == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"k8s_id": {
diff --git a/internal/service/cloudbroker/kvmvm/data_source_compute.go b/internal/service/cloudbroker/kvmvm/data_source_compute.go
index 4622b2b..2999e3b 100644
--- a/internal/service/cloudbroker/kvmvm/data_source_compute.go
+++ b/internal/service/cloudbroker/kvmvm/data_source_compute.go
@@ -34,7 +34,6 @@ package kvmvm
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	// "net/url"
@@ -77,44 +76,15 @@ func parseComputeDisksToExtraDisks(disks []DiskRecord) []interface{} {
 	return result
 }
 
-func parseBootDiskSize(disks []DiskRecord) int {
-	// this return value will be used to d.Set("boot_disk_size",) item of dataSourceCompute schema
-	if len(disks) == 0 {
-		return 0
-	}
-
-	for _, value := range disks {
-		if value.Type == "B" {
-			return value.SizeMax
-		}
-	}
-
-	return 0
-}
-
-func parseBootDiskId(disks []DiskRecord) uint {
-	// this return value will be used to d.Set("boot_disk_id",) item of dataSourceCompute schema
-	if len(disks) == 0 {
-		return 0
-	}
-
-	for _, value := range disks {
-		if value.Type == "B" {
-			return value.ID
-		}
-	}
-
-	return 0
-}
-
-func findBootDisk(disks []DiskRecord) (*DiskRecord, error) {
+func findBootDisk(disks []DiskRecord) *DiskRecord {
 	for _, d := range disks {
 		if d.Type == "B" {
-			return &d, nil
+			return &d
 		}
 	}
 
-	return nil, errors.New("boot disk not found")
+	// some computes don't have a boot disk, so...
+	return &DiskRecord{}
 }
 
 // Parse the list of interfaces from compute/get response into a list of networks
@@ -181,10 +151,7 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
 		d.Set("started", false)
 	}
 
-	bootDisk, err := findBootDisk(model.Disks)
-	if err != nil {
-		return err
-	}
+	bootDisk := findBootDisk(model.Disks)
 
 	d.Set("boot_disk_size", bootDisk.SizeMax)
 	d.Set("boot_disk_id", bootDisk.ID) // we may need boot disk ID in resize operations
diff --git a/internal/service/cloudbroker/kvmvm/resource_compute.go b/internal/service/cloudbroker/kvmvm/resource_compute.go
index 2d6c2a3..6bf5c49 100644
--- a/internal/service/cloudbroker/kvmvm/resource_compute.go
+++ b/internal/service/cloudbroker/kvmvm/resource_compute.go
@@ -33,7 +33,6 @@ package kvmvm
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/url"
 	"strconv"
@@ -129,6 +128,21 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 	d.SetId(apiResp) // update ID of the resource to tell Terraform that the resource exists, albeit partially
 	compId, _ := strconv.Atoi(apiResp)
 
+	cleanup := false
+	defer func() {
+		if cleanup {
+			urlValues := &url.Values{}
+			urlValues.Add("computeId", d.Id())
+			urlValues.Add("permanently", "1")
+			urlValues.Add("detachDisks", "1")
+
+			if _, err := c.DecortAPICall(ctx, "POST", ComputeDeleteAPI, urlValues); err != nil {
+				log.Errorf("resourceComputeCreate: could not delete compute after failed creation: %v", err)
+			}
+			d.SetId("")
+		}
+	}()
+
 	log.Debugf("resourceComputeCreate: new simple Compute ID %d, name %s created", compId, d.Get("name").(string))
 
 	// Configure data disks if any
@@ -139,6 +153,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		err = utilityComputeExtraDisksConfigure(ctx, d, m, false) // do_delta=false, as we are working on a new compute
 		if err != nil {
 			log.Errorf("resourceComputeCreate: error when attaching extra disk(s) to a new Compute ID %d: %v", compId, err)
+			cleanup = true
 			return diag.FromErr(err)
 		}
 	}
@@ -149,6 +164,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		err = utilityComputeNetworksConfigure(ctx, d, m, false) // do_delta=false, as we are working on a new compute
 		if err != nil {
 			log.Errorf("resourceComputeCreate: error when attaching networks to a new Compute ID %d: %s", compId, err)
+			cleanup = true
 			return diag.FromErr(err)
 		}
 	}
@@ -160,6 +176,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		reqValues.Add("computeId", fmt.Sprintf("%d", compId))
 		log.Debugf("resourceComputeCreate: starting Compute ID %d after completing its resource configuration", compId)
 		if _, err := c.DecortAPICall(ctx, "POST", ComputeStartAPI, reqValues); err != nil {
+			cleanup = true
 			return diag.FromErr(err)
 		}
 	}
@@ -297,72 +314,20 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	log.Debugf("resourceComputeDelete: called for Compute name %s, RG ID %d",
 		d.Get("name").(string), d.Get("rg_id").(int))
 
-	compFacts, err := utilityComputeCheckPresence(ctx, d, m)
-	if compFacts == "" {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		// the target Compute does not exist - in this case according to Terraform best practice
-		// we exit from Destroy method without error
-		return nil
-	}
-
 	c := m.(*controller.ControllerCfg)
 
-	model := ComputeGetResp{}
-	log.Debugf("resourceComputeDelete: ready to unmarshal string %s", compFacts)
-	err = json.Unmarshal([]byte(compFacts), &model)
-	if err == nil && len(model.Disks) > 0 {
-		// prepare to detach data disks from compute - do it only if compFacts unmarshalled
-		// properly and the resulting model contains non-empty Disks list
-		for _, diskFacts := range model.Disks {
-			if diskFacts.Type == "B" {
-				// boot disk is never detached on compute delete
-				continue
-			}
-
-			log.Debugf("resourceComputeDelete: ready to detach data disk ID %d from compute ID %s", diskFacts.ID, d.Id())
-
-			detachParams := &url.Values{}
-			detachParams.Add("computeId", d.Id())
-			detachParams.Add("diskId", fmt.Sprintf("%d", diskFacts.ID))
-
-			_, err = c.DecortAPICall(ctx, "POST", ComputeDiskDetachAPI, detachParams)
-			if err != nil {
-				// We do not fail compute deletion on data disk detach errors
-				log.Errorf("resourceComputeDelete: error when detaching Disk ID %d: %s", diskFacts.ID, err)
-			}
-		}
-	}
-
 	params := &url.Values{}
 	params.Add("computeId", d.Id())
 	params.Add("permanently", "1")
-	// TODO: this is for the upcoming API update - params.Add("detachdisks", "1")
+	params.Add("detachDisks", "1")
 
-	_, err = c.DecortAPICall(ctx, "POST", ComputeDeleteAPI, params)
-	if err != nil {
+	if _, err := c.DecortAPICall(ctx, "POST", ComputeDeleteAPI, params); err != nil {
 		return diag.FromErr(err)
 	}
 
 	return nil
 }
 
-func resourceComputeExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	// Reminder: according to Terraform rules, this function should not modify its ResourceData argument
-	log.Debugf("resourceComputeExist: called for Compute name %s, RG ID %d",
-		d.Get("name").(string), d.Get("rg_id").(int))
-
-	compFacts, err := utilityComputeCheckPresence(ctx, d, m)
-	if compFacts == "" {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func ResourceCompute() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
diff --git a/internal/service/cloudbroker/pcidevice/data_source_pcidevice_list.go b/internal/service/cloudbroker/pcidevice/data_source_pcidevice_list.go
index ce9baef..3933790 100644
--- a/internal/service/cloudbroker/pcidevice/data_source_pcidevice_list.go
+++ b/internal/service/cloudbroker/pcidevice/data_source_pcidevice_list.go
@@ -64,7 +64,7 @@ func flattenPcideviceList(pl PcideviceList) []map[string]interface{} {
 }
 
 func dataSourcePcideviceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	pcideviceList, err := utilityPcideviceListCheckPresence(ctx, d, m)
+	pcideviceList, err := utilityPcideviceListCheckPresence(ctx, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/internal/service/cloudbroker/pcidevice/resource_pcidevice.go b/internal/service/cloudbroker/pcidevice/resource_pcidevice.go
index ebcd5dc..1fcb0d9 100644
--- a/internal/service/cloudbroker/pcidevice/resource_pcidevice.go
+++ b/internal/service/cloudbroker/pcidevice/resource_pcidevice.go
@@ -115,18 +115,6 @@ func resourcePcideviceDelete(ctx context.Context, d *schema.ResourceData, m inte
 	return nil
 }
 
-func resourcePcideviceExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	pcidevice, err := utilityPcideviceCheckPresence(ctx, d, m)
-	if err != nil {
-		return false, err
-	}
-	if pcidevice == nil {
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourcePcideviceEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	if d.HasChange("enable") {
 		state := d.Get("enable").(bool)
diff --git a/internal/service/cloudbroker/pcidevice/utility_pcidevice.go b/internal/service/cloudbroker/pcidevice/utility_pcidevice.go
index 9b22947..3ace283 100644
--- a/internal/service/cloudbroker/pcidevice/utility_pcidevice.go
+++ b/internal/service/cloudbroker/pcidevice/utility_pcidevice.go
@@ -39,7 +39,7 @@ import (
 )
 
 func utilityPcideviceCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*Pcidevice, error) {
-	pcideviceList, err := utilityPcideviceListCheckPresence(ctx, d, m)
+	pcideviceList, err := utilityPcideviceListCheckPresence(ctx, m)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/service/cloudbroker/pcidevice/utility_pcidevice_list.go b/internal/service/cloudbroker/pcidevice/utility_pcidevice_list.go
index ada9adc..97e65b5 100644
--- a/internal/service/cloudbroker/pcidevice/utility_pcidevice_list.go
+++ b/internal/service/cloudbroker/pcidevice/utility_pcidevice_list.go
@@ -36,11 +36,10 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/rudecs/terraform-provider-decort/internal/controller"
 )
 
-func utilityPcideviceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (PcideviceList, error) {
+func utilityPcideviceListCheckPresence(ctx context.Context, m interface{}) (PcideviceList, error) {
 	pcideviceList := PcideviceList{}
 	c := m.(*controller.ControllerCfg)
 	urlValues := &url.Values{}
diff --git a/internal/service/cloudbroker/pfw/resource_pfw.go b/internal/service/cloudbroker/pfw/resource_pfw.go
index 199187b..70b3e75 100644
--- a/internal/service/cloudbroker/pfw/resource_pfw.go
+++ b/internal/service/cloudbroker/pfw/resource_pfw.go
@@ -122,20 +122,6 @@ func resourcePfwDelete(ctx context.Context, d *schema.ResourceData, m interface{
 	return nil
 }
 
-func resourcePfwExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourcePfwExists: called for compute %d, rule %s", d.Get("compute_id").(int), d.Id())
-
-	pfw, err := utilityPfwCheckPresence(ctx, d, m)
-	if pfw == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourcePfwSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"compute_id": {
diff --git a/internal/service/cloudbroker/rg/resource_rg.go b/internal/service/cloudbroker/rg/resource_rg.go
index d893334..09334ba 100644
--- a/internal/service/cloudbroker/rg/resource_rg.go
+++ b/internal/service/cloudbroker/rg/resource_rg.go
@@ -297,18 +297,6 @@ func resourceResgroupDelete(ctx context.Context, d *schema.ResourceData, m inter
 	return nil
 }
 
-func resourceResgroupExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	// Reminder: according to Terraform rules, this function should NOT modify ResourceData argument
-	rg_facts, err := utilityResgroupCheckPresence(ctx, d, m)
-	if rg_facts == "" {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func ResourceResgroup() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
diff --git a/internal/service/cloudbroker/sep/resource_sep.go b/internal/service/cloudbroker/sep/resource_sep.go
index f6561f7..9bc2fff 100644
--- a/internal/service/cloudbroker/sep/resource_sep.go
+++ b/internal/service/cloudbroker/sep/resource_sep.go
@@ -160,20 +160,6 @@ func resourceSepDelete(ctx context.Context, d *schema.ResourceData, m interface{
 	return nil
 }
 
-func resourceSepExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceSepExists: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-
-	sepDes, err := utilitySepCheckPresence(ctx, d, m)
-	if sepDes == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceSepEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceSepEdit: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
 	c := m.(*controller.ControllerCfg)
diff --git a/internal/service/cloudbroker/snapshot/resource_snapshot.go b/internal/service/cloudbroker/snapshot/resource_snapshot.go
index 9a8fbc7..2169720 100644
--- a/internal/service/cloudbroker/snapshot/resource_snapshot.go
+++ b/internal/service/cloudbroker/snapshot/resource_snapshot.go
@@ -101,18 +101,6 @@ func resourceSnapshotDelete(ctx context.Context, d *schema.ResourceData, m inter
 	return nil
 }
 
-func resourceSnapshotExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	snapshot, err := utilitySnapshotCheckPresence(ctx, d, m)
-	if err != nil {
-		return false, err
-	}
-	if snapshot == nil {
-		return false, nil
-	}
-
-	return true, nil
-}
-
 func resourceSnapshotEdit(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	if d.HasChange("rollback") {
 		if d.Get("rollback").(bool) {
diff --git a/internal/service/cloudbroker/vins/resource_vins.go b/internal/service/cloudbroker/vins/resource_vins.go
index 22729f6..a394b87 100644
--- a/internal/service/cloudbroker/vins/resource_vins.go
+++ b/internal/service/cloudbroker/vins/resource_vins.go
@@ -210,21 +210,6 @@ func resourceVinsDelete(ctx context.Context, d *schema.ResourceData, m interface
 	return nil
 }
 
-func resourceVinsExists(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	// Reminder: according to Terraform rules, this function should not modify its ResourceData argument
-	log.Debugf("resourceVinsExists: called for ViNS name %s, Account ID %d, RG ID %d",
-		d.Get("name").(string), d.Get("account_id").(int), d.Get("rg_id").(int))
-
-	vinsFacts, err := utilityVinsCheckPresence(ctx, d, m)
-	if vinsFacts == "" {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func resourceVinsSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"name": {