removed emacs noise, cleaned cruft