Tidied out unused mappings and neutralised <Esc>