Move around some maps, tidy up
Remove duplidate calls to Rxxxx