Remove Mac functions
Add emacs shortcut