diff --git a/extensions/appprovider/pkg/command/command.go b/extensions/appprovider/pkg/command/command.go
index 43e7025b5..2c1399446 100644
--- a/extensions/appprovider/pkg/command/command.go
+++ b/extensions/appprovider/pkg/command/command.go
@@ -24,9 +24,6 @@ func AppProvider(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "app-provider",
 		Usage: "start appprovider for providing apps",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage-app-provider")
-		// },
 		Action: func(c *cli.Context) error {
 			logCfg := cfg.Logging
 			logger := log.NewLogger(
@@ -105,7 +102,6 @@ func appProviderConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
 			// TODO build services dynamically
 			"services": map[string]interface{}{
 				"appprovider": map[string]interface{}{
-					// "gatewaysvc":       cfg.Reva.Gateway.Endpoint,
 					"app_provider_url": cfg.ExternalAddr,
 					"driver":           cfg.Driver,
 					"drivers": map[string]interface{}{
@@ -143,7 +139,6 @@ func NewAppProvider(cfg *ociscfg.Config) suture.Service {
 }
 
 func (s AppProviderSutureService) Serve(ctx context.Context) error {
-	// s.cfg.Reva.AppProvider.Context = ctx
 	cmd := AppProvider(s.cfg)
 	f := &flag.FlagSet{}
 	cmdFlags := cmd.Flags
diff --git a/extensions/auth-basic/pkg/command/command.go b/extensions/auth-basic/pkg/command/command.go
index 7f42e7cc9..44745e482 100644
--- a/extensions/auth-basic/pkg/command/command.go
+++ b/extensions/auth-basic/pkg/command/command.go
@@ -162,7 +162,6 @@ func NewAuthBasic(cfg *ociscfg.Config) suture.Service {
 }
 
 func (s AuthBasicSutureService) Serve(ctx context.Context) error {
-	// s.cfg.Reva.AuthBasic.Context = ctx
 	f := &flag.FlagSet{}
 	cmdFlags := AuthBasic(s.cfg).Flags
 	for k := range cmdFlags {
diff --git a/extensions/auth-bearer/pkg/command/command.go b/extensions/auth-bearer/pkg/command/command.go
index 93b4ef343..dd27a0b8e 100644
--- a/extensions/auth-bearer/pkg/command/command.go
+++ b/extensions/auth-bearer/pkg/command/command.go
@@ -134,7 +134,6 @@ func NewAuthBearer(cfg *ociscfg.Config) suture.Service {
 }
 
 func (s AuthBearerSutureService) Serve(ctx context.Context) error {
-	// s.cfg.Reva.AuthBearer.Context = ctx
 	cmd := AuthBearer(s.cfg)
 	f := &flag.FlagSet{}
 	cmdFlags := cmd.Flags
diff --git a/extensions/gateway/pkg/command/command.go b/extensions/gateway/pkg/command/command.go
index 5b731605d..3c8a15941 100644
--- a/extensions/gateway/pkg/command/command.go
+++ b/extensions/gateway/pkg/command/command.go
@@ -394,7 +394,6 @@ func NewGateway(cfg *ociscfg.Config) suture.Service {
 }
 
 func (s GatewaySutureService) Serve(ctx context.Context) error {
-	// s.cfg.Reva.Gateway.Context = ctx
 	cmd := Gateway(s.cfg)
 	f := &flag.FlagSet{}
 	cmdFlags := cmd.Flags
diff --git a/extensions/storage/pkg/command/health.go b/extensions/storage/pkg/command/health.go
index 2c6fbd184..1d8882e37 100644
--- a/extensions/storage/pkg/command/health.go
+++ b/extensions/storage/pkg/command/health.go
@@ -14,9 +14,6 @@ func Health(cfg *config.Config) *cli.Command {
 		Name:     "health",
 		Usage:    "check health status",
 		Category: "info",
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage")
-		// },
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 
diff --git a/extensions/storage/pkg/command/root.go b/extensions/storage/pkg/command/root.go
index 55911eea9..864c281f5 100644
--- a/extensions/storage/pkg/command/root.go
+++ b/extensions/storage/pkg/command/root.go
@@ -12,19 +12,6 @@ import (
 // GetCommands provides all commands for this service
 func GetCommands(cfg *config.Config) cli.Commands {
 	return []*cli.Command{
-		// Frontend(cfg),
-		// Gateway(cfg),
-		// Users(cfg),
-		// Groups(cfg),
-		// AppProvider(cfg),
-		// AuthBasic(cfg),
-		// AuthBearer(cfg),
-		// AuthMachine(cfg),
-		// Sharing(cfg),
-		// StoragePublicLink(cfg),
-		// StorageShares(cfg),
-		// StorageUsers(cfg),
-		// StorageMetadata(cfg),
 		Health(cfg),
 	}
 }
@@ -35,10 +22,6 @@ func Execute(cfg *config.Config) error {
 		Name:  "storage",
 		Usage: "Storage service for oCIS",
 
-		// Before: func(c *cli.Context) error {
-		// 	return ParseConfig(c, cfg, "storage")
-		// },
-
 		Commands: GetCommands(cfg),
 	})
 
diff --git a/ocis-pkg/ldap/ldap.go b/ocis-pkg/ldap/ldap.go
index d9e83a7ee..6ad6951a3 100644
--- a/ocis-pkg/ldap/ldap.go
+++ b/ocis-pkg/ldap/ldap.go
@@ -16,7 +16,7 @@ func WaitForCA(log log.Logger, insecure bool, caCert string) error {
 			log.Warn().Str("LDAP CACert", caCert).Msgf("File does not exist. Waiting %d seconds for it to appear.", _caTimeout)
 			time.Sleep(_caTimeout * time.Second)
 			if _, err := os.Stat(caCert); errors.Is(err, os.ErrNotExist) {
-				log.Warn().Str("LDAP CACert", caCert).Msgf("File does still not exist after Timeout")
+				log.Warn().Str("LDAP CACert", caCert).Msgf("File still does not exist after Timeout")
 				return err
 			}
 		}