Add elisp bindings
Remove unused