mappings cleanup