cleanup some mappings