Emacs spring cleaning

Clear out unused code and simplify a bit.