diff --git a/cmd/dagger/cmd/query.go b/cmd/dagger/cmd/query.go
deleted file mode 100644
index 522734b8..00000000
--- a/cmd/dagger/cmd/query.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-
-	"cuelang.org/go/cue"
-	"go.dagger.io/dagger/cmd/dagger/cmd/common"
-	"go.dagger.io/dagger/cmd/dagger/logger"
-	"go.dagger.io/dagger/compiler"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var queryCmd = &cobra.Command{
-	Use:   "query [TARGET] [flags]",
-	Short: "Query the contents of an environment",
-	Args:  cobra.MaximumNArgs(1),
-	PreRun: func(cmd *cobra.Command, args []string) {
-		// Fix Viper bug for duplicate flags:
-		// https://github.com/spf13/viper/issues/233
-		if err := viper.BindPFlags(cmd.Flags()); err != nil {
-			panic(err)
-		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		lg := logger.New()
-		ctx := lg.WithContext(cmd.Context())
-
-		project := common.CurrentProject(ctx)
-		state := common.CurrentEnvironmentState(ctx, project)
-
-		lg = lg.With().
-			Str("environment", state.Name).
-			Logger()
-
-		cueOpts := parseQueryFlags()
-		cuePath := cue.MakePath()
-		if len(args) > 0 {
-			cuePath = cue.ParsePath(args[0])
-		}
-
-		doneCh := common.TrackProjectCommand(ctx, cmd, project, state)
-
-		cueVal := compiler.NewValue()
-
-		if !viper.GetBool("no-plan") {
-			plan, err := state.CompilePlan(ctx)
-			if err != nil {
-				lg.Fatal().Err(err).Msg("failed to compile plan")
-			}
-			if err := cueVal.FillPath(cue.MakePath(), plan); err != nil {
-				lg.Fatal().Err(err).Msg("failed to compile plan")
-			}
-		}
-
-		if !viper.GetBool("no-input") {
-			inputs, err := state.CompileInputs()
-			if err != nil {
-				lg.Fatal().Err(err).Msg("failed to compile inputs")
-			}
-
-			if err := cueVal.FillPath(cue.MakePath(), inputs); err != nil {
-				lg.Fatal().Err(err).Msg("failed to compile inputs")
-			}
-		}
-
-		if !viper.GetBool("no-computed") && state.Computed != "" {
-			computed, err := compiler.DecodeJSON("", []byte(state.Computed))
-			if err != nil {
-				lg.Fatal().Err(err).Msg("failed to decode json")
-			}
-			if err := cueVal.FillPath(cue.MakePath(), computed); err != nil {
-				lg.Fatal().Err(err).Msg("failed to merge plan with computed")
-			}
-		}
-
-		<-doneCh
-
-		cueVal = cueVal.LookupPath(cuePath)
-
-		if viper.GetBool("concrete") {
-			if err := cueVal.IsConcreteR(); err != nil {
-				lg.Fatal().Err(compiler.Err(err)).Msg("not concrete")
-			}
-		}
-
-		format := viper.GetString("format")
-		switch format {
-		case "cue":
-			out, err := cueVal.Source(cueOpts...)
-			if err != nil {
-				lg.Fatal().Err(err).Msg("failed to lookup source")
-			}
-			fmt.Println(string(out))
-		case "json":
-			fmt.Println(cueVal.JSON().PrettyString())
-		case "yaml":
-			lg.Fatal().Msg("yaml format not yet implemented")
-		case "text":
-			out, err := cueVal.String()
-			if err != nil {
-				lg.Fatal().Err(err).Msg("value can't be formatted as text")
-			}
-			fmt.Println(out)
-		default:
-			lg.Fatal().Msgf("unsupported format: %q", format)
-		}
-	},
-}
-
-func parseQueryFlags() []cue.Option {
-	opts := []cue.Option{
-		cue.Definitions(true),
-	}
-
-	if viper.GetBool("concrete") {
-		opts = append(opts, cue.Concrete(true))
-	}
-
-	if viper.GetBool("show-optional") {
-		opts = append(opts, cue.Optional(true))
-	}
-
-	if viper.GetBool("show-attributes") {
-		opts = append(opts, cue.Attributes(true))
-	}
-
-	return opts
-}
-
-func init() {
-	queryCmd.Flags().BoolP("concrete", "c", false, "Require the evaluation to be concrete")
-	queryCmd.Flags().BoolP("show-optional", "O", false, "Display optional fields (cue format only)")
-	queryCmd.Flags().BoolP("show-attributes", "A", false, "Display field attributes (cue format only)")
-
-	// FIXME: implement the flags below
-	// queryCmd.Flags().String("revision", "latest", "Query a specific version of the environment")
-	queryCmd.Flags().StringP("format", "f", "json", "Output format (json|yaml|cue|text|env)")
-	queryCmd.Flags().BoolP("no-plan", "P", false, "Exclude plan from query")
-	queryCmd.Flags().BoolP("no-input", "I", false, "Exclude inputs from query")
-	queryCmd.Flags().BoolP("no-computed", "C", false, "Exclude computed values from query")
-
-	if err := viper.BindPFlags(queryCmd.Flags()); err != nil {
-		panic(err)
-	}
-}
diff --git a/cmd/dagger/cmd/root.go b/cmd/dagger/cmd/root.go
index 5390b244..8e371722 100644
--- a/cmd/dagger/cmd/root.go
+++ b/cmd/dagger/cmd/root.go
@@ -55,7 +55,6 @@ func init() {
 		initCmd,
 		newCmd,
 		listCmd,
-		queryCmd,
 		upCmd,
 		downCmd,
 		editCmd,