More clean-up for medians