diff --git a/rigpa-buffer-mode.el b/rigpa-buffer-mode.el
index ae0fdf3..b27d690 100644
--- a/rigpa-buffer-mode.el
+++ b/rigpa-buffer-mode.el
@@ -36,7 +36,6 @@
 (require 's)
 (require 'dynaring)
 (require 'buffer-ring)
-(require 'rigpa-local)
 
 (defconst rigpa-buffer-ring-name-prefix "rigpa-buffer-ring")
 
diff --git a/rigpa-local.el b/rigpa-local.el
deleted file mode 100644
index ef1b9fe..0000000
--- a/rigpa-local.el
+++ /dev/null
@@ -1,36 +0,0 @@
-;;; rigpa-local.el --- Self-reflective editing modes -*- lexical-binding: t -*-
-
-;; URL: https://github.com/countvajhula/rigpa
-
-;; This program is "part of the world," in the sense described at
-;; http://drym.org.  From your perspective, this is no different than
-;; MIT or BSD or other such "liberal" licenses that you may be
-;; familiar with, that is to say, you are free to do whatever you like
-;; with this program.  It is much more than BSD or MIT, however, in
-;; that it isn't a license at all but an idea about the world and how
-;; economic systems could be set up so that everyone wins.  Learn more
-;; at drym.org.
-;;
-;; This work transcends traditional legal and economic systems, but
-;; for the purposes of any such systems within which you may need to
-;; operate:
-;;
-;; This is free and unencumbered software released into the public domain.
-;; The authors relinquish any copyright claims on this work.
-;;
-
-;;; Commentary:
-;;
-;; Buffer-local variables
-;;
-
-;;; Code:
-
-;; the editing complex to use in a buffer
-;; by default this is general complex unless a more tailored one
-;; has been set (e.g. via major mode hook)
-(defvar-local rigpa--complex nil)
-
-
-(provide 'rigpa-local)
-;;; rigpa-local.el ends here
diff --git a/rigpa-mode-mode.el b/rigpa-mode-mode.el
index 3e07117..93959a1 100644
--- a/rigpa-mode-mode.el
+++ b/rigpa-mode-mode.el
@@ -31,7 +31,6 @@
 (require 'chimera)
 (require 'rigpa-text-parsers)
 (require 'rigpa-meta)
-(require 'rigpa-local)
 
 (evil-define-state mode
   "Mode state."
diff --git a/rigpa-tower-mode.el b/rigpa-tower-mode.el
index d7c309d..3e720de 100644
--- a/rigpa-tower-mode.el
+++ b/rigpa-tower-mode.el
@@ -30,7 +30,6 @@
 (require 'hydra)
 (require 'rigpa-mode-mode)
 (require 'rigpa-types)
-(require 'rigpa-local)
 
 ;; make these buffer-local first before abstracting "state"
 (defvar rigpa--current-tower-index 0)
diff --git a/rigpa.el b/rigpa.el
index d0f8285..77b3c6b 100644
--- a/rigpa.el
+++ b/rigpa.el
@@ -47,7 +47,6 @@
 (require 'chimera)
 (require 'ht)
 (require 'rigpa-custom)
-(require 'rigpa-local)
 (require 'rigpa-char-mode)
 (require 'rigpa-word-mode)
 (require 'rigpa-line-mode)
@@ -368,7 +367,11 @@ and simply toggles whether the menu is visible or not."
          :default "meta-tower"
          :members (list rigpa-meta-tower-mode-tower)))
 
-  (defvar-local rigpa--complex rigpa-general-complex))
+  ;; the editing complex to use in a buffer
+  ;; by default this is general complex unless a more tailored one
+  ;; has been set (e.g. via major mode hook)
+  (setq rigpa--complex rigpa-general-complex)
+  (make-variable-buffer-local 'rigpa--complex))
 
 (defun rigpa--provide-editing-structures ()
   "Register editing structures so they're used in relevant major modes."