cleaned up some unused code. movement in the direction of making emacs 22 work
better switching between emacs 22 and 24 - not quite there