removed useless things and adjusted emacs