Got rid of unused mappings.