[minor] remove global mappings, use local buffer mappings for each one