Cleanup: remove unused code + unimpaired -> undo as I only undo mappings