Removed unused mappings