diff --git a/csys/csys.lisp b/csys/csys.lisp
index 8d5328c..2ad0522 100644
--- a/csys/csys.lisp
+++ b/csys/csys.lisp
@@ -65,7 +65,7 @@
 (defun create (prg env &key (categ '(:csys :c00)) name value)
   (let* ((domain (car categ))
          (addr (when name (list domain (cadr categ) name)))
-         (scope (scope prg env :categ categ))
+         (scope (apply #'scope prg env :categ categ (when value (list :value value))))
          (msg (message:create (list domain :create)
                               :data (when addr (list :addr addr)))))
     (do-create msg scope)))
diff --git a/scopes-substrate.asd b/scopes-substrate.asd
deleted file mode 100644
index 92c76d9..0000000
--- a/scopes-substrate.asd
+++ /dev/null
@@ -1,25 +0,0 @@
-(in-package #:asdf-user)
-
-(defsystem :scopes-substrate
-  :author "cyberconcepts.org Team <team@cyberconcepts.org>"
-  :license "MIT"
-  :version "0.0.1"
-  :homepage "https://www.cyberconcepts.org"
-  :description "Communication substrate."
-  :depends-on (:alexandria :cl-dotenv :cl-readline :com.inuoe.jzon 
-               :flexi-streams :ironclad :local-time :log4cl 
-               :lparallel :qbase64 :serapeum :str
-               :scopes-core)
-  :components ((:file "config" :depends-on ("util/util"))
-               (:file "substrate/substrate" 
-                      :depends-on ("config"))
-               (:file "util/util"))
-  :long-description "scopes/substrate: Communication substrate, sort of new core."
-  :in-order-to ((test-op (test-op "scopes-substrate/test"))))
-
-(defsystem :scopes-substrate/test
-  :depends-on (:scopes-substrate)
-  :components ( (:file "test/test-substrate"))
-  :perform (test-op (o c) 
-    (symbol-call :scopes/test-substrate :run)))
-
diff --git a/substrate/substrate.lisp b/substrate/substrate.lisp
deleted file mode 100644
index a84a93b..0000000
--- a/substrate/substrate.lisp
+++ /dev/null
@@ -1,21 +0,0 @@
-;;;; cl-scopes/substrate - communication substrate.
-
-(defpackage :scopes/substrate
-  (:use :common-lisp)
-  (:local-nicknames (:async :scopes/util/async)
-                    (:config :scopes/config)
-                    (:util :scopes/util))
-  (:export #:*root*
-           #:add-action #:config)) 
-
-(in-package :scopes/substrate)
-
-(defvar *root* nil)
-
-(defclass config (config:base)
-  ()
-  )
-
-(defclass dispatcher ()
-  ()
-  )
diff --git a/test/etc/config-substrate.lisp b/test/etc/config-substrate.lisp
deleted file mode 100644
index dbcfac1..0000000
--- a/test/etc/config-substrate.lisp
+++ /dev/null
@@ -1,13 +0,0 @@
-;;;; cl-scopes/test/etc/config-substrate - configuration for `config-substrate` tests.
-
-(in-package :scopes/test-substrate)
-
-(config:root)
-
-(config:add :logger  :class 'logging:config
-            :loglevel (config:from-env :loglevel :info)
-            :logfile (t:test-path "scopes-test.log" "log")
-            :console nil)
-
-(config:add :substrate :class 'substrate:config)
-
diff --git a/test/test-substrate.lisp b/test/test-substrate.lisp
deleted file mode 100644
index d6b8b07..0000000
--- a/test/test-substrate.lisp
+++ /dev/null
@@ -1,27 +0,0 @@
-;;;; cl-scopes/test-substrate - testing for the scopes-substrate system.
-
-(defpackage :scopes/test-substrate
-  (:use :common-lisp)
-  (:local-nicknames (:config :scopes/config)
-                    (:logging :scopes/logging)
-                    (:substrate :scopes/substrate)
-                    (:message :scopes/core/message)
-                    (:t :scopes/testing))
-  (:export #:run)
-  (:import-from :scopes/testing #:deftest #:== #:!=))
-
-(in-package :scopes/test-substrate)
-
-(defun run ()
-  (let* ((t:*test-suite* (make-instance 't:test-suite :name "substrate")))
-    (load (t:test-path "config-substrate" "etc"))
-    ;(substrate:setup)
-    (unwind-protect
-      (progn
-        (test-basic)
-      )
-      (t:show-result))))
-
-(deftest test-basic ()
-  ;(substrate:send msg)
-)