diff --git a/schema/array.go b/schema/array.go
index 7273337110..0709c1f584 100644
--- a/schema/array.go
+++ b/schema/array.go
@@ -24,7 +24,7 @@ func findDimensionsFromValue(value reflect.Value, dimensions []ArrayDimension, e
 		fallthrough
 	case reflect.Slice:
 		length := value.Len()
-		if 0 == elementsLength {
+		if elementsLength == 0 {
 			elementsLength = length
 		} else {
 			elementsLength *= length
diff --git a/schema/inet_test.go b/schema/inet_test.go
index f2a912fef6..a033bf2764 100644
--- a/schema/inet_test.go
+++ b/schema/inet_test.go
@@ -85,8 +85,7 @@ func TestInetMarshalUnmarshal(t *testing.T) {
 	if !bytes.Equal(r.IPNet.Mask, r2.IPNet.Mask) {
 		t.Errorf("%v != %v", r.IPNet.Mask, r2.IPNet.Mask)
 	}
-	//nolint:all
-	if !bytes.Equal(r.IPNet.IP, r2.IPNet.IP) {
+	if !net.IP.Equal(r.IPNet.IP, r2.IPNet.IP) {
 		t.Errorf("%v != %v", r.IPNet.IP, r2.IPNet.IP)
 	}
 }
diff --git a/schema/resource.go b/schema/resource.go
index 99b12475e5..f2a993b398 100644
--- a/schema/resource.go
+++ b/schema/resource.go
@@ -2,8 +2,6 @@ package schema
 
 import (
 	"fmt"
-
-	"github.com/google/uuid"
 )
 
 type Resources []*Resource
@@ -89,14 +87,6 @@ func (r *Resource) GetValues() CQTypes {
 	return r.data
 }
 
-func (r *Resource) ID() uuid.UUID {
-	index := r.Table.Columns.Index(CqIDColumn.Name)
-	if index == -1 {
-		return uuid.UUID{}
-	}
-	return uuid.UUID{}
-}
-
 func (r *Resource) Columns() []string {
 	return r.Table.Columns.Names()
 }
@@ -117,13 +107,6 @@ func (r *Resource) Validate() error {
 	return nil
 }
 
-func (rr Resources) GetIds() []uuid.UUID {
-	rids := make([]uuid.UUID, len(rr))
-	for i, r := range rr {
-		rids[i] = r.ID()
-	}
-	return rids
-}
 func (rr Resources) TableName() string {
 	if len(rr) == 0 {
 		return ""