Mappings cleanup