Finished cleanup of mappings