Trying to clean up while fixing due to upgrade to emacs 24.4