Cleaned up some maps

Some maps weren't using `noremap`.