Removed some unused mappings