Removed one macro
Moved mode activation to esc-mode-hook