diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 46f9f48d3dd1b3a00b5c5c56c235780e71787999..c4abb5d5504d123320d90a70dd065a246366b69b 100644
--- a/pkg/extension/extension.go
+++ b/pkg/extension/extension.go
@@ -2,11 +2,9 @@ package extension
 
 import (
 	"context"
-	"fmt"
 
 	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
-	"git.perx.ru/perxis/perxis-go/pkg/items"
 	pb "git.perx.ru/perxis/perxis-go/proto/extensions"
 )
 
@@ -28,25 +26,6 @@ type (
 	State               = pb.State
 )
 
-//type State pb.State
-//
-//func (s State) Value() int {
-//	return int(s)
-//}
-//
-//func (s State) String() string {
-//	return pb.State(s).String()
-//}
-//
-//const (
-//	StatePending    = State(pb.State_PENDING)
-//	StateInstalled  = State(pb.State_INSTALLED)
-//	StateInProgress = State(pb.State_IN_PROGRESS)
-//	StateFail       = State(pb.State_FAIL)
-//
-//	//ExtensionMetadataKey = "extension"
-//)
-
 var (
 	ErrStart = errors.New("start failed")
 	ErrStop  = errors.New("stop failed")
@@ -85,26 +64,9 @@ type Extension interface {
 }
 
 func CheckInstalled(ctx context.Context, content *content.Content, spaceID, envID, extension string) (bool, error) {
-	res, _, err := content.Items.Find(ctx, spaceID, envID, StatusCollectionID,
-		&items.Filter{Q: []string{fmt.Sprintf("id == '%s'", extension)}})
+	status, err := NewStorage(content).GetStatus(ctx, spaceID, envID, extension)
 	if err != nil {
 		return false, err
 	}
-
-	if len(res) == 0 || res[0].Data["extension_state"] != int64(StateInstalled) {
-		return false, nil
-	}
-
-	return true, nil
-
+	return status.Installed, nil
 }
-
-//func ExtensionError(err error, ext string) error {
-//	return errors.WithContext(err, "extension", ext)
-//}
-//
-//func ExtensionFromError(err error) string {
-//	v, _ := errors.ContextKey(err, "extension")
-//	ext, _ := v.(string)
-//	return ext
-//}
diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go
index f80b978bf029b5f019bd86df4464e2321b5e68c3..35a8f559bd9ba3042ec5c6569b1f821656a53afd 100644
--- a/pkg/extension/storage.go
+++ b/pkg/extension/storage.go
@@ -54,7 +54,7 @@ func statusFromItem(extension string, item *items.Item) *Status {
 		State:            State(state),
 		Msg:              msg,
 		Error:            errmsg,
-		Installed:        true,
+		Installed:        State(state) == StateInstalled,
 		InstalledVersion: ver,
 	}
 }