Remove references to min/max