Remove unused file
Fix keymaps