diff --git a/pkg/cri/store/errors.go b/pkg/cri/store/errors.go
deleted file mode 100644
index d8398e45f..000000000
--- a/pkg/cri/store/errors.go
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package store
-
-import "github.com/containerd/containerd/errdefs"
-
-var (
-	// ErrAlreadyExist is the error returned when data added in the store
-	// already exists.
-	//
-	// This error has been DEPRECATED and will be removed in 1.5. Please switch
-	// usage directly to `errdefs.ErrAlreadyExists`.
-	ErrAlreadyExist = errdefs.ErrAlreadyExists
-	// ErrNotExist is the error returned when data is not in the store.
-	//
-	// This error has been DEPRECATED and will be removed in 1.5. Please switch
-	// usage directly to `errdefs.ErrNotFound`.
-	ErrNotExist = errdefs.ErrNotFound
-)
diff --git a/pkg/cri/store/errors_test.go b/pkg/cri/store/errors_test.go
deleted file mode 100644
index 11b38bfd7..000000000
--- a/pkg/cri/store/errors_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package store
-
-import (
-	"testing"
-
-	"github.com/containerd/containerd/errdefs"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-func TestStoreErrAlreadyExistGRPCStatus(t *testing.T) {
-	err := errdefs.ToGRPC(errdefs.ErrAlreadyExists)
-	s, ok := status.FromError(err)
-	if !ok {
-		t.Fatalf("failed to convert err: %v to status: %d", err, codes.AlreadyExists)
-	}
-	if s.Code() != codes.AlreadyExists {
-		t.Fatalf("expected code: %d got: %d", codes.AlreadyExists, s.Code())
-	}
-}
-
-func TestStoreErrNotExistGRPCStatus(t *testing.T) {
-	err := errdefs.ToGRPC(errdefs.ErrNotFound)
-	s, ok := status.FromError(err)
-	if !ok {
-		t.Fatalf("failed to convert err: %v to status: %d", err, codes.NotFound)
-	}
-	if s.Code() != codes.NotFound {
-		t.Fatalf("expected code: %d got: %d", codes.NotFound, s.Code())
-	}
-}
diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go
index 6b36ea1b1..7d71d3741 100644
--- a/pkg/cri/store/image/image.go
+++ b/pkg/cri/store/image/image.go
@@ -136,7 +136,7 @@ func getImage(ctx context.Context, i containerd.Image) (*Image, error) {
 
 	spec, err := i.Spec(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read get image spec: %w", err)
+		return nil, fmt.Errorf("failed to get OCI image spec: %w", err)
 	}
 
 	return &Image{