remove previously added settings in favour of get_clean_quantity_value that uses quantity type set for product
Merge remote-tracking branch 'upstream/master'