Add match end of line J/K
remove shit mappings