     (define-key map (kbd "C-c C-q") #'pjones:term-quoted-insert)
 
     ;; Other functions:
-    (define-key map (kbd "C-c C-k") #'pjones:term-line-mode)
+    (define-key map (kbd "C-c C-k") #'evil-normal-state)
     (define-key map (kbd "C-c C-r") #'pjones:term-rename)
-    (define-key map (kbd "C-c C-u") #'universal-argument)
-    (define-key map (kbd "C-y")     #'term-paste)
-    (define-key map (kbd "C-z")     pjones:z-map)
     (define-key map (kbd "M-x")     nil)))
 
 (advice-add 'term-handle-exit :after 'pjones:remove-dead-term)

    (kill-buffer buffer)))

;; FIXME: this doesn't really work. Write a new version based off the
;; same idea in EXWM.
(defun pjones:term-quoted-insert (count)
  "Read next input character and send it directly to the terminal.


(defun pjones:term-char-mode ()
  "Return to raw/character mode."
  (interactive)
  (let ((proc (get-buffer-process (current-buffer))))
    (when proc
      (term-char-mode)
      (goto-char (process-mark proc)))))

(defmacro pjones:term-send-char (chars)
  "Create a function to send CHARS to the terminal."
