Remove todo and fix conflict with eshell and god-mode