cleanup for emacs 24.3