More cleanup
Clean up some emacs lisp