Remove unused file
Fix keymaps
Merge branch 'develop'