clean up oscmapping slightly