P50 cleanup