Clean up some mappings