Removed unused mappings 2