removed extra stuff that had been needed for old versions of emacs