Now improved RTL mapping a bit
Remove leader mappings