initial cleanup for emacs