Removed things not required for emacs 24